rUtilAnts 1.0.0.20120223 → 1.0.1.20130320

data/AUTHORS

@@ -7,3 +7,4 @@
 * 0.2.2.20101125
 * 0.3.0.20110825
 * 1.0.0.20120223
+* 1.0.1.20130320

data/ChangeLog

@@ -1,5 +1,13 @@
 = rUtilAnts Release History
 
+== 1.0.1.20130320 (Beta)
+
+* [Platform] Added missing platforms, works for JRuby and MacOS
+* [MySQLPool] Bug correction: Could not close connections correctly
+* [Plugins] Removed warning about unused variable
+* Updated Release file to last version of RubyPackager (1.1.0)
+* Use SSH key as authentication method
+
 == 1.0.0.20120223 (Beta)
 
 * Renamed public methods to match standard Ruby's conventions

data/ReleaseInfo

@@ -2,7 +2,7 @@
 # This file has been generated by RubyPackager during a delivery.
 # More info about RubyPackager: http://rubypackager.sourceforge.net
 {
-  :Version => '1.0.0.20120223',
-  :Tags => [ 'Beta' ],
-  :DevStatus => 'Beta'
+  :version => '1.0.1.20130320',
+  :tags => [ 'Beta' ],
+  :dev_status => 'Beta'
 }

data/lib/rUtilAnts/MySQLPool.rb

@@ -165,6 +165,7 @@ module RUtilAnts
     def close_prepared_statement(iMySQLConnection, iPreparedStatement)
       lPreparedStatements = $RUtilAnts_MySQLPool_Pool[findMySQLConnectionKey(iMySQLConnection)][2]
       lFound = false
+      lDelete = nil
       lPreparedStatements.each do |iStrSQL, ioPreparedStatementInfo|
         if (ioPreparedStatementInfo[0] == iPreparedStatement)
           # Found it
@@ -172,13 +173,14 @@ module RUtilAnts
             ioPreparedStatementInfo[1] -= 1
             if (ioPreparedStatementInfo[1] == 0)
               # Close it for real
-              ioPreparedStatementInfo[1].close
-              lPreparedStatements[iStrSQL] = nil
+              ioPreparedStatementInfo[0].close
+              lDelete = iStrSQL
             end
           end
           lFound = true
         end
       end
+      lPreparedStatements.delete(lDelete) if (lDelete != nil)
       if (!lFound)
         raise MissingPreparedStatementFromPoolError.new("Prepared statement #{iPreparedStatement.inspect} can't be found among the pool of MySQL connection #{iMySQLConnection.inspect}")
       end

data/lib/rUtilAnts/Platform.rb

@@ -11,16 +11,35 @@ module RUtilAnts
 
       # Initialize the module
       def self.includePlatformSpecificModule
+        # Get the OS
+        require 'rbconfig'
+        real_os ||= (
+          host_os = RbConfig::CONFIG['host_os']
+          case host_os
+          when /cygwin/
+            'cygwin'
+          when /mswin|msys|mingw|bccwin|wince|emc/
+            'windows'
+          when /darwin|mac os/
+            'macosx'
+          when /linux/
+            'linux'
+          when /solaris|bsd/
+            'unix'
+          else
+            raise RuntimeError, "Unknown os: #{host_os.inspect}"
+          end
+        )
         # Require the platform info
         begin
-          require "rUtilAnts/Platforms/#{RUBY_PLATFORM}/PlatformInfo"
+          require "rUtilAnts/Platforms/#{real_os}/PlatformInfo"
         rescue Exception
           if (!defined?(log_bug))
             require 'rUtilAnts/Logging'
             RUtilAnts::Logging::install_logger_on_object
           end
-          log_bug "Current platform #{RUBY_PLATFORM} is not supported (#{$!})."
-          raise RuntimeError, "Current platform #{RUBY_PLATFORM} is not supported (#{$!})."
+          log_bug "Current platform #{real_os} is not supported (#{$!})."
+          raise RuntimeError, "Current platform #{real_os} is not supported (#{$!})."
         end
         # Include the platform specific module
         PlatformInterface.module_eval('include RUtilAnts::Platform::PlatformInfo')
@@ -40,6 +59,7 @@ module RUtilAnts
     OS_WINDOWS = 0
     OS_LINUX = 1
     OS_CYGWIN = 2
+    OS_MACOSX = 3
 
     # Initialize the platform info
     def self.install_platform_on_object
@@ -49,4 +69,4 @@ module RUtilAnts
 
   end
 
-end
+end

data/lib/rUtilAnts/Platforms/{i386-mswin32 → macosx}/PlatformInfo.rb

@@ -15,7 +15,7 @@ module RUtilAnts
       # Return::
       # * _Integer_: OS ID
       def os
-        return OS_WINDOWS
+        return OS_MACOSX
       end
 
       # Return the list of directories where we look for executables
@@ -23,7 +23,7 @@ module RUtilAnts
       # Return::
       # * <em>list<String></em>: List of directories
       def getSystemExePath
-        return ENV['PATH'].split(';')
+        return ENV['PATH'].split(':')
       end
 
       # Set the list of directories where we look for executables
@@ -31,7 +31,7 @@ module RUtilAnts
       # Parameters::
       # * *iNewDirsList* (<em>list<String></em>): List of directories
       def setSystemExePath(iNewDirsList)
-        ENV['PATH'] = iNewDirsList.join(';')
+        ENV['PATH'] = iNewDirsList.join(':')
       end
 
       # Return the list of file extensions that might be discretely happened to executable files.
@@ -40,13 +40,7 @@ module RUtilAnts
       # Return::
       # * <em>list<String></em>: List of extensions (including .)
       def getDiscreteExeExtensions
-        rExtList = []
-
-        ENV['PATHEXT'].split(';').each do |iExt|
-          rExtList << iExt.downcase
-        end
-
-        return rExtList
+        return []
       end
 
       # Return the list of directories where we look for libraries
@@ -54,7 +48,13 @@ module RUtilAnts
       # Return::
       # * <em>list<String></em>: List of directories
       def getSystemLibsPath
-        return ENV['PATH'].split(';')
+        rList = ENV['PATH'].split(':')
+
+        if (ENV['LD_LIBRARY_PATH'] != nil)
+          rList += ENV['LD_LIBRARY_PATH'].split(':')
+        end
+
+        return rList
       end
 
       # Set the list of directories where we look for libraries
@@ -62,7 +62,7 @@ module RUtilAnts
       # Parameters::
       # * *iNewDirsList* (<em>list<String></em>): List of directories
       def setSystemLibsPath(iNewDirsList)
-        ENV['PATH'] = iNewDirsList.join(';')
+        ENV['LD_LIBRARY_PATH'] = iNewDirsList.join(':')
       end
 
       # This method sends a message (platform dependent) to the user, without the use of wxruby
@@ -70,13 +70,15 @@ module RUtilAnts
       # Parameters::
       # * *iMsg* (_String_): The message to display
       def sendMsg(iMsg)
-        # iMsg must not be longer than 255 characters
-        # \n must be escaped.
-        if (iMsg.size > 255)
-          system("msg \"#{ENV['USERNAME']}\" /W \"#{iMsg[0..254]}\"")
-        else
-          system("msg \"#{ENV['USERNAME']}\" /W \"#{iMsg}\"")
+        # TODO: Handle case of xmessage not installed
+        # Create a temporary file with the content to display
+        require 'tmpdir'
+        lTmpFileName = "#{Dir.tmpdir}/RUA_MSG"
+        File.open(lTmpFileName, 'w') do |oFile|
+          oFile.write(iMsg)
         end
+        system("xmessage -file #{lTmpFileName}")
+        File.unlink(lTmpFileName)
       end
 
       # Execute a Shell command.
@@ -91,7 +93,8 @@ module RUtilAnts
         rException = nil
 
         if (iInTerminal)
-          if (!system("start cmd /c #{iCmd}"))
+          # TODO: Handle case of xterm not installed
+          if (!system("xterm -e \"#{iCmd}\""))
             rException = RuntimeError.new
           end
         else
@@ -114,12 +117,10 @@ module RUtilAnts
       def launchURL(iURL)
         rError = nil
 
-        # We must put " around the URL after the http:// prefix, as otherwise & symbol will not be recognized
-        lMatch = iURL.match(/^(http|https|ftp|ftps):\/\/(.*)$/)
-        if (lMatch == nil)
-          rError = "URL #{iURL} is not one of http://, https://, ftp:// or ftps://. Can't invoke it."
-        else
-          IO.popen("start #{lMatch[1]}://\"#{lMatch[2]}\"")
+        begin
+          IO.popen("xdg-open '#{iURL}'")
+        rescue Exception
+          rError = $!.to_s
         end
 
         return rError
@@ -130,15 +131,7 @@ module RUtilAnts
       # Return::
       # * <em>list<String></em>: List of extensions (including . character). It can be empty.
       def getExecutableExtensions
-        rLstExt = [ '.exe', '.com', '.bat' ]
-
-        # Use PATHEXT environment variable if possible
-        if (ENV['PATHEXT'] != nil)
-          rLstExt.concat(ENV['PATHEXT'].split(';').map { |iExt| iExt.downcase })
-          rLstExt.uniq!
-        end
-
-        return rLstExt
+        return []
       end
 
       # Get prohibited characters from file names
@@ -146,7 +139,7 @@ module RUtilAnts
       # Return::
       # * _String_: String of prohibited characters in file names
       def getProhibitedFileNamesCharacters
-        return '\\/:*?"<>|'
+        return '/'
       end
 
       # Create a shortcut (ln -s on Cygwin/Unix systems, a .lnk file on Windows systems)
@@ -155,10 +148,8 @@ module RUtilAnts
       # * *iSrc* (_String_): The source file
       # * *iDst* (_String_): The destination file
       def createShortcut(iSrc, iDst)
-        require 'win32/shortcut'
-        Win32::Shortcut.new(getShortcutFileName(iDst)) do |oShortcut|
-          oShortcut.path = File.expand_path(iSrc)
-        end
+        require 'fileutils'
+        FileUtils::ln_s(iSrc, iDst)
       end
 
       # Get the name of a real file name, pointed by a shortcut.
@@ -169,8 +160,7 @@ module RUtilAnts
       # Return::
       # * _String_: The real file name pointed by this shortcut
       def followShortcut(iShortcutName)
-        require 'win32/shortcut'
-        return Win32::Shortcut.open(getShortcutFileName(iShortcutName)).path
+        return File.readlink(iShortcutName)
       end
 
       # Get the real file name of a shortcut
@@ -180,7 +170,7 @@ module RUtilAnts
       # Return::
       # * _String_: The real shortcut file name
       def getShortcutFileName(iDst)
-        return "#{iDst}.lnk"
+        return iDst
       end
 
     end

data/lib/rUtilAnts/Plugins.rb

@@ -130,7 +130,6 @@ module RUtilAnts
           # Don't load it now, but store it along with its description if it exists
           if (@Plugins[iCategory][lPluginName] == nil)
             # Check if we have a description
-            lDesc = lDescriptions[lPluginName]
             register_new_plugin(
               iCategory,
               lPluginName,
@@ -223,7 +222,7 @@ module RUtilAnts
                   # Load other plugins
                   lDesc[:PluginsDependencies].each do |iPluginInfo|
                     iPluginCategory, iPluginName = iPluginInfo
-                    lPlugin, lError = get_plugin_instance(iPluginCategory, iPluginName, iParameters)
+                    _, lError = get_plugin_instance(iPluginCategory, iPluginName, iParameters)
                     lSuccess = (lError == nil)
                     if (!lSuccess)
                       # Don't try further

metadata

@@ -1,33 +1,22 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rUtilAnts
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 0
-  - 20120223
-  version: 1.0.0.20120223
+version: !ruby/object:Gem::Version
+  version: 1.0.1.20130320
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Muriel Salvan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-23 00:00:00 +01:00
-default_executable: 
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies: []
-
 description: rUtilAnts is used by several projects. It includes common standard code.
 email: muriel@x-aeon.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - AUTHORS
 - ChangeLog
 - Credits
@@ -40,11 +29,11 @@ files:
 - lib/rUtilAnts/Misc.rb
 - lib/rUtilAnts/MySQLPool.rb
 - lib/rUtilAnts/Platform.rb
-- lib/rUtilAnts/Platforms/i386-cygwin/PlatformInfo.rb
-- lib/rUtilAnts/Platforms/i386-linux/PlatformInfo.rb
-- lib/rUtilAnts/Platforms/i386-mingw32/PlatformInfo.rb
-- lib/rUtilAnts/Platforms/i386-mswin32/PlatformInfo.rb
-- lib/rUtilAnts/Platforms/x86_64-linux/PlatformInfo.rb
+- lib/rUtilAnts/Platforms/cygwin/PlatformInfo.rb
+- lib/rUtilAnts/Platforms/linux/PlatformInfo.rb
+- lib/rUtilAnts/Platforms/macosx/PlatformInfo.rb
+- lib/rUtilAnts/Platforms/unix/PlatformInfo.rb
+- lib/rUtilAnts/Platforms/windows/PlatformInfo.rb
 - lib/rUtilAnts/Plugins.rb
 - lib/rUtilAnts/SingletonProxy.rb
 - lib/rUtilAnts/URLAccess.rb
@@ -56,37 +45,28 @@ files:
 - LICENSE
 - README
 - ReleaseInfo
-has_rdoc: true
 homepage: http://rutilants.sourceforge.net/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: rutilants
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A collection of various utility libraries.
 test_files: []
-