RubyPackager 0.1.1.20091105 → 0.2.1.20101110

data/ChangeLog

@@ -1,5 +1,33 @@
 = RubyPackager Release History
 
+== 0.2.0.20101110 (Beta)
+
+=== Misc
+
+* Changed DevStatus to Beta.
+* Updated Copyright information.
+* Used rUtilAnts' changeDir.
+
+=== New features
+
+* Release files can now specify several executables to be considered.
+* Release files can now specify several require paths to be considered using :RequirePaths
+
+=== API changes
+
+* API change for Installer plugins: added parameter to know if test files are part of the release.
+* Changed API for plugins generating executables: executable info is given instead of all info.
+* Changed API for plugins getting executables information: :ExecutableInfo replaced by :ExecutablesInfo, giving a list of executables info.
+
+=== Bug corrections
+
+* Bug correction: Gem Installer: Unable to release a gem without test files if test files were declared in the release info.
+* Bug correction: Gem Installer: Unable to release a gem with a platform other than Ruby.
+* Bug correction: Executables generated for Linux did not run.
+* Bug correction: Read ReleaseInfo from its correct location.
+* Bug correction: Running executables on Windows did not work sometimes.
+* Bug correction: When Ruby version did include a patch level, output of Ruby was expected incorrectly.
+
 == 0.1.1.20091105 (Alpha)
 
 === New features

data/LICENSE

@@ -6,7 +6,7 @@ This list is found in the file named AUTHORS.
 The AUTHORS and LICENSE files have to be included in any release of software
 embedding source code of this package, or using it as a derivative software.
 
-Copyright (c) 2009 Muriel Salvan (murielsalvan@users.sourceforge.net)
+Copyright (c) 2009-2010 Muriel Salvan (murielsalvan@users.sourceforge.net)
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

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 => '0.1.1.20091105',
-  :Tags => [],
-  :DevStatus => 'Alpha'
+  :Version => '0.2.1.20101110',
+  :Tags => [ 'Beta' ],
+  :DevStatus => 'Beta'
 }

data/TODO

@@ -12,3 +12,5 @@
 ** Make it run under MacOS
 ** Make rdoc modifications part of a real Gem or an RDoc improvement.
 ** Use RDI in checkContext methods.
+** As it is possible to have many failures when delivering or generating installers, and as generating executables and documentation is a long process, it should be better to reuse partially generated content.
+** Delivering a Gem has to be done using "gem push" with a RubyGems.org account info.

data/bin/Release.rb

@@ -1,6 +1,6 @@
 #!env ruby
 #--
-# Copyright (c) 2009 Muriel Salvan (murielsalvan@users.sourceforge.net)
+# Copyright (c) 2009-2010 Muriel Salvan (murielsalvan@users.sourceforge.net)
 # Licensed under the terms specified in LICENSE file. No warranty is provided.
 #++
 
@@ -13,6 +13,8 @@
 
 require 'rUtilAnts/Logging'
 RUtilAnts::Logging::initializeLogging("#{File.dirname(__FILE__)}/..", 'http://sourceforge.net/tracker/?group_id=274236&atid=1165400')
+require 'rUtilAnts/Misc'
+RUtilAnts::Misc.initializeMisc
 
 module RubyPackager
 
@@ -36,7 +38,7 @@ module RubyPackager
         :Tags => [],
         :DevStatus => 'Unofficial'
       }
-      lReleaseInfoFileName = "#{File.dirname(FILE_PATH)}/ReleaseInfo"
+      lReleaseInfoFileName = "#{File.dirname(FILE_PATH)}/../ReleaseInfo"
       if (File.exists?(lReleaseInfoFileName))
         File.open(lReleaseInfoFileName, 'r') do |iFile|
           lRPReleaseInfo = eval(iFile.read)

data/lib/RubyPackager/Distributors/SourceForge.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2009 Muriel Salvan (murielsalvan@users.sourceforge.net)
+# Copyright (c) 2009-2010 Muriel Salvan (murielsalvan@users.sourceforge.net)
 # Licensed under the terms specified in LICENSE file. No warranty is provided.
 #++
 
@@ -59,7 +59,7 @@ module RubyPackager
         @SFReleaseDir = "/home/frs/project/#{@SFProjectSubPath}/#{@ReleaseVersion}"
         createSFShell
         createReleaseOnSFNET
-        # It is possible that he RDoc has not been generated
+        # It is possible that the RDoc has not been generated
         if (File.exists?("#{@DocDir}/rdoc"))
           uploadRDocOnSFNET
         end
@@ -93,10 +93,9 @@ module RubyPackager
       def uploadRDocOnSFNET
         logDebug 'Uploading RDoc on SF.NET ...'
         # Zip the RDoc
-        lOldDir = Dir.getwd
-        Dir.chdir(@DocDir)
-        system("zip -r rdoc.zip rdoc")
-        Dir.chdir(lOldDir)
+        changeDir(@DocDir) do
+          system("zip -r rdoc.zip rdoc")
+        end
         # Send it
         lRDocBaseDir = "/home/groups/#{@SFProjectSubPath}/htdocs/rdoc"
         sshWithPassword(

data/lib/RubyPackager/Installers/Gem.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2009 Muriel Salvan (murielsalvan@users.sourceforge.net)
+# Copyright (c) 2009-2010 Muriel Salvan (murielsalvan@users.sourceforge.net)
 # Licensed under the terms specified in LICENSE file. No warranty is provided.
 #++
 
@@ -17,52 +17,80 @@ module RubyPackager
       # * *iInstallerDir* (_String_): The directory where the installer has to be put
       # * *iVersion* (_String_): Release version
       # * *iReleaseInfo* (_ReleaseInfo_): Release info
+      # * *iIncludeTest* (_Boolean_): Are test files part of the release ?
       # Return:
       # * _String_: File name to distribute, or nil in case of failure
-      def createInstaller(iRootDir, iReleaseDir, iInstallerDir, iVersion, iReleaseInfo)
+      def createInstaller(iRootDir, iReleaseDir, iInstallerDir, iVersion, iReleaseInfo, iIncludeTest)
         rFileName = nil
 
-        lOldDir = Dir.getwd
-        Dir.chdir(iReleaseDir)
-        # 1. Generate the gemspec that will build the gem
-        lStrHasRDoc = nil
-        if (iReleaseInfo.GemInfo[:HasRDoc])
-          lStrHasRDoc = 'true'
-        else
-          lStrHasRDoc = 'false'
-        end
-        # !!! Don't use absolute paths here, otherwise they will be stored in the Gem
-        lStrFiles = "iSpec.files = [ '#{Dir.glob('**/*').join('\', \'')}' ]"
-        lStrExtraRDocFiles = ''
-        if ((iReleaseInfo.GemInfo[:ExtraRDocFiles] != nil) and
-            (!iReleaseInfo.GemInfo[:ExtraRDocFiles].empty?))
-          lStrExtraRDocFiles = "iSpec.extra_rdoc_files = [ '#{iReleaseInfo.GemInfo[:ExtraRDocFiles].join('\', \'')}' ]"
-          RubyPackager::copyFiles(iRootDir, iReleaseDir, iReleaseInfo.GemInfo[:ExtraRDocFiles])
-        end
-        lGemDepsStrList = []
-        if (iReleaseInfo.GemInfo[:GemDependencies] != nil)
-          iReleaseInfo.GemInfo[:GemDependencies].each do |iGemDepInfo|
-            iGemName, iGemVersion = iGemDepInfo
-            if (iGemVersion != nil)
-              lGemDepsStrList << "iSpec.add_dependency('#{iGemName}', '#{iGemVersion}')"
-            else
-              lGemDepsStrList << "iSpec.add_dependency('#{iGemName}')"
+        changeDir(iReleaseDir) do
+          # 1. Generate the gemspec that will build the gem
+          lStrHasRDoc = nil
+          if (iReleaseInfo.GemInfo[:HasRDoc])
+            lStrHasRDoc = 'true'
+          else
+            lStrHasRDoc = 'false'
+          end
+          # !!! Don't use absolute paths here, otherwise they will be stored in the Gem
+          lStrFiles = "iSpec.files = [ '#{Dir.glob('**/*').join('\', \'')}' ]"
+          lStrExtraRDocFiles = ''
+          if ((iReleaseInfo.GemInfo[:ExtraRDocFiles] != nil) and
+              (!iReleaseInfo.GemInfo[:ExtraRDocFiles].empty?))
+            lStrExtraRDocFiles = "iSpec.extra_rdoc_files = [ '#{iReleaseInfo.GemInfo[:ExtraRDocFiles].join('\', \'')}' ]"
+            RubyPackager::copyFiles(iRootDir, iReleaseDir, iReleaseInfo.GemInfo[:ExtraRDocFiles])
+          end
+          lGemDepsStrList = []
+          if (iReleaseInfo.GemInfo[:GemDependencies] != nil)
+            iReleaseInfo.GemInfo[:GemDependencies].each do |iGemDepInfo|
+              iGemName, iGemVersion = iGemDepInfo
+              if (iGemVersion != nil)
+                lGemDepsStrList << "iSpec.add_dependency('#{iGemName}', '#{iGemVersion}')"
+              else
+                lGemDepsStrList << "iSpec.add_dependency('#{iGemName}')"
+              end
             end
           end
-        end
-        lStrTestFile = ''
-        if (iReleaseInfo.GemInfo[:TestFile] != nil)
-          lStrTestFile = "iSpec.test_file = '#{iReleaseInfo.GemInfo[:TestFile]}'"
-        end
-        lStrBinDir = ''
-        lStrDefaultExecutable = ''
-        if (iReleaseInfo.ExecutableInfo[:StartupRBFile] != nil)
-          lStrBinDir = "iSpec.bindir = '#{File.dirname(iReleaseInfo.ExecutableInfo[:StartupRBFile])}'"
-          lStrDefaultExecutable = "iSpec.executables = [ '#{File.basename(iReleaseInfo.ExecutableInfo[:StartupRBFile])}' ]"
-        end
-        lGemSpecFileName = 'release.gemspec.rb'
-        File.open(lGemSpecFileName, 'w') do |oFile|
-          oFile << "
+          lStrTestFile = ''
+          if ((iIncludeTest) and
+              (iReleaseInfo.GemInfo[:TestFile] != nil))
+            lStrTestFile = "iSpec.test_file = '#{iReleaseInfo.GemInfo[:TestFile]}'"
+          end
+          # Compute the list of executable files and the executable directory
+          lBinError = false
+          lExecutablesDir = nil
+          lExecutablesBase = []
+          iReleaseInfo.ExecutablesInfo.each do |iExecutableInfo|
+            if (lExecutablesDir == nil)
+              lExecutablesDir = File.dirname(iExecutableInfo[:StartupRBFile])
+            elsif (lExecutablesDir != File.dirname(iExecutableInfo[:StartupRBFile]))
+              # Error
+              logErr "Executables should be all in the same directory. \"#{lExecutablesDir}\" and \"#{File.dirname(iExecutableInfo[:StartupRBFile])}\" are different directories."
+              lBinError = true
+            end
+            lExecutablesBase << File.basename(iExecutableInfo[:StartupRBFile])
+          end
+          if (!lBinError)
+            lStrBinDir = ''
+            lStrExecutables = ''
+            if (lExecutablesDir != nil)
+              lStrBinDir = "iSpec.bindir = '#{lExecutablesDir}'"
+              lStrExecutables = "iSpec.executables = #{lExecutablesBase.inspect}"
+            end
+            # Compute require paths
+            lRequirePaths = []
+            if (iReleaseInfo.GemInfo[:RequirePath] != nil)
+              lRequirePaths = [ iReleaseInfo.GemInfo[:RequirePath] ]
+            end
+            if (iReleaseInfo.GemInfo[:RequirePaths] != nil)
+              lRequirePaths.concat(iReleaseInfo.GemInfo[:RequirePaths])
+            end
+            lStrRequirePaths = 'iSpec.require_path = \'\''
+            if (!lRequirePaths.empty?)
+              lStrRequirePaths = "iSpec.require_paths = #{lRequirePaths.inspect}"
+            end
+            lGemSpecFileName = 'release.gemspec.rb'
+            File.open(lGemSpecFileName, 'w') do |oFile|
+              oFile << "
 Gem::Specification.new do |iSpec|
   iSpec.name = '#{iReleaseInfo.GemInfo[:GemName]}'
   iSpec.version = '#{iVersion}'
@@ -73,39 +101,45 @@ Gem::Specification.new do |iSpec|
   iSpec.summary = '#{iReleaseInfo.ProjectInfo[:Summary].gsub(/'/,'\\\\\'')}'
   iSpec.description = '#{iReleaseInfo.ProjectInfo[:Description].gsub(/'/,'\\\\\'')}'
   #{lStrFiles}
-  iSpec.require_path = '#{iReleaseInfo.GemInfo[:RequirePath]}'
+  #{lStrRequirePaths}
   iSpec.has_rdoc = #{lStrHasRDoc}
   #{lStrExtraRDocFiles}
   iSpec.rubyforge_project = '#{iReleaseInfo.RFInfo[:ProjectUnixName]}'
   #{lStrTestFile}
   #{lStrBinDir}
-  #{lStrDefaultExecutable}
+  #{lStrExecutables}
   #{lGemDepsStrList.join("\n")}
 end
 "
-        end
-        # 2. Call gem build with this gemspec
-        # Load RubyGems
-        require 'rubygems/command_manager'
-        # Build gem
-        lGemOK = true
-        begin
-          ::Gem::CommandManager.instance.find_command('build').invoke(lGemSpecFileName)
-        rescue ::Gem::SystemExitException
-          # For RubyGems, this is normal behaviour: success results in an exception thrown with exit_code 0.
-          if ($!.exit_code != 0)
-            logErr "RubyGems returned error #{$!.exit_code}."
-            lGemOK = false
+            end
+            # 2. Call gem build with this gemspec
+            # Load RubyGems
+            require 'rubygems/command_manager'
+            # Build gem
+            lGemOK = true
+            begin
+              ::Gem::CommandManager.instance.find_command('build').invoke(lGemSpecFileName)
+            rescue ::Gem::SystemExitException
+              # For RubyGems, this is normal behaviour: success results in an exception thrown with exit_code 0.
+              if ($!.exit_code != 0)
+                logErr "RubyGems returned error #{$!.exit_code}."
+                lGemOK = false
+              end
+            end
+            File.unlink(lGemSpecFileName)
+            if (lGemOK)
+              # Move the Gem to the destination directory
+              require 'fileutils'
+              # Find the name of the Gem: it can differ depending on the platform
+              rFileName = Dir.glob("#{iReleaseInfo.GemInfo[:GemName]}-#{iVersion}*.gem")[0]
+              if (rFileName == nil)
+                logErr "Unable to find generated gem \"#{iReleaseInfo.GemInfo[:GemName]}-#{iVersion}*.gem\""
+              else
+                FileUtils::mv(rFileName, "#{iInstallerDir}/#{rFileName}")
+              end
+            end
           end
         end
-        File.unlink(lGemSpecFileName)
-        if (lGemOK)
-          # Move the Gem to the destination directory
-          require 'fileutils'
-          rFileName = "#{iReleaseInfo.GemInfo[:GemName]}-#{iVersion}.gem"
-          FileUtils::mv(rFileName, "#{iInstallerDir}/#{rFileName}")
-        end
-        Dir.chdir(lOldDir)
 
         return rFileName
       end

data/lib/RubyPackager/ReleaseInfo.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2009 Muriel Salvan (murielsalvan@users.sourceforge.net)
+# Copyright (c) 2009-2010 Muriel Salvan (murielsalvan@users.sourceforge.net)
 # Licensed under the terms specified in LICENSE file. No warranty is provided.
 #++
 
@@ -16,9 +16,9 @@ module RubyPackager
     #   map< Symbol, Object >
     attr_reader :ProjectInfo
 
-    # Information about the executable
-    #   map< Symbol, Object >
-    attr_reader :ExecutableInfo
+    # Information about the executables
+    #   list< map< Symbol, Object > >
+    attr_reader :ExecutablesInfo
 
     # Information about the installer
     #   map< Symbol, Object >
@@ -53,7 +53,7 @@ module RubyPackager
       # This sets also default values
       @AuthorInfo = {}
       @ProjectInfo = {}
-      @ExecutableInfo = {}
+      @ExecutablesInfo = []
       @InstallInfo = {}
       @SFInfo = {}
       @RFInfo = {}
@@ -99,7 +99,8 @@ module RubyPackager
       return self
     end
 
-    # Add executable package properties
+    # Add executable package properties.
+    # This method can be called several times to specify several executables.
     #
     # Parameters:
     # * *iParams* (<em>map<Symbol,Object></em>): The parameters:
@@ -110,7 +111,7 @@ module RubyPackager
     # Return:
     # * _ReleaseInfo_: self
     def executable(iParams)
-      @ExecutableInfo.merge!(iParams)
+      @ExecutablesInfo << iParams
 
       return self
     end
@@ -163,7 +164,8 @@ module RubyPackager
     # * *iParams* (<em>map<Symbol,Object></em>): The parameters:
     # ** *:GemName* (_String_): The Gem name
     # ** *:GemPlatformClassName* (_String_): The name of the Gem platform class
-    # ** *:RequirePath* (_String_): Path to require
+    # ** *:RequirePath* (_String_): Single path to require
+    # ** *:RequirePaths* (<em>list<String></em>): Paths to require
     # ** *:HasRDoc* (_String_): Include RDoc in the Gem ?
     # ** *:ExtraRDocFiles* (<em>list<String></em>): List of file patterns to be included in the RDoc but not in the Gem
     # ** *:TestFile* (_String_): Name of the test file to execute

data/lib/RubyPackager/Releaser.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2009 Muriel Salvan (murielsalvan@users.sourceforge.net)
+# Copyright (c) 2009-2010 Muriel Salvan (murielsalvan@users.sourceforge.net)
 # Licensed under the terms specified in LICENSE file. No warranty is provided.
 #++
 
@@ -102,7 +102,7 @@ module RubyPackager
             (!@ReleaseInfo.checkReadyForRelease(@RootDir)))
           rSuccess = false
         end
-        if (@ReleaseInfo.ExecutableInfo[:ExeName] != nil)
+        if (!@ReleaseInfo.ExecutablesInfo.empty?)
           # Check tools for platform dependent considerations
           if (!@PlatformReleaseInfo.checkExeTools(@RootDir, @IncludeRuby))
             rSuccess = false
@@ -146,7 +146,7 @@ module RubyPackager
                 @Installers.each do |iInstallerName|
                   logOp("Create installer #{iInstallerName}") do
                     @PluginsManager.accessPlugin('Installers', iInstallerName) do |ioPlugin|
-                      lFileName = ioPlugin.createInstaller(@RootDir, @ReleaseDir, @InstallerDir, @ReleaseVersion, @ReleaseInfo)
+                      lFileName = ioPlugin.createInstaller(@RootDir, @ReleaseDir, @InstallerDir, @ReleaseVersion, @ReleaseInfo, @IncludeTest)
                       if (lFileName == nil)
                         rSuccess = false
                       else
@@ -217,11 +217,13 @@ module RubyPackager
 "
         end
       end
-      if (@ReleaseInfo.ExecutableInfo[:ExeName] != nil)
-        logOp('Create binary') do
-          # TODO (crate): When crate will work correctly under Windows, use it here to pack everything
-          # For now the executable creation is platform dependent
-          rSuccess = @PlatformReleaseInfo.createBinary(@RootDir, @ReleaseDir, @IncludeRuby, @ReleaseInfo)
+      @ReleaseInfo.ExecutablesInfo.each do |iExecutableInfo|
+        if (iExecutableInfo[:ExeName] != nil)
+          logOp("Create binary #{iExecutableInfo[:ExeName]}") do
+            # TODO (crate): When crate will work correctly under Windows, use it here to pack everything
+            # For now the executable creation is platform dependent
+            rSuccess = @PlatformReleaseInfo.createBinary(@RootDir, @ReleaseDir, @IncludeRuby, iExecutableInfo)
+          end
         end
       end
       if (rSuccess)
@@ -278,16 +280,15 @@ module RubyPackager
           "--output=#{@DocDir}/rdoc"
         ]
         # Bug (RDoc): Sometimes it does not change current directory correctly (not deterministic)
-        lOldDir = Dir.getwd
-        Dir.chdir(@ReleaseDir)
-        # First try with Muriel's template
-        begin
-          RDoc::RDoc.new.document( lRDocOptions + [ '--fmt=muriel' ] )
-        rescue Exception
-          # Then try with default template
-          RDoc::RDoc.new.document( lRDocOptions )
+        changeDir(@ReleaseDir) do
+          # First try with Muriel's template
+          begin
+            RDoc::RDoc.new.document( lRDocOptions + [ '--fmt=muriel' ] )
+          rescue Exception
+            # Then try with default template
+            RDoc::RDoc.new.document( lRDocOptions )
+          end
         end
-        Dir.chdir(lOldDir)
       end
 
       return rSuccess

data/lib/RubyPackager/Tools.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2009 Muriel Salvan (murielsalvan@users.sourceforge.net)
+# Copyright (c) 2009-2010 Muriel Salvan (murielsalvan@users.sourceforge.net)
 # Licensed under the terms specified in LICENSE file. No warranty is provided.
 #++
 

data/lib/RubyPackager/i386-cygwin/PlatformReleaser.rb

@@ -0,0 +1,112 @@
+#--
+# Copyright (c) 2009-2010 Muriel Salvan (murielsalvan@users.sourceforge.net)
+# Licensed under the terms specified in LICENSE file. No warranty is provided.
+#++
+
+# This file prepares a cygwin distribution
+
+# Require needed to generate the temporary ruby file that produces the executable
+require 'tmpdir'
+
+module RubyPackager
+
+  class PlatformReleaser
+
+    PLATFORM_DIR = File.dirname(__FILE__)
+
+    # Check if the tools we will use to generate an executable are present
+    #
+    # Parameters:
+    # * *iRootDir* (_String_): Root directory
+    # * *iIncludeRuby* (_Boolean_): Do we include Ruby in the release ?
+    # Return:
+    # * _Boolean_: Are tools correctly useable ?
+    def checkExeTools(iRootDir, iIncludeRuby)
+      rSuccess = true
+
+      if (iIncludeRuby)
+        # We need allinoneruby
+        if (Gem.find_files('allinoneruby').empty?)
+          logErr "Need to have allinoneruby gem to release including Ruby.\nPlease install allinoneruby gem (gem install allinoneruby)."
+          rSuccess = false
+        end
+      end
+
+      return rSuccess
+    end
+
+    # Create the binary.
+    # This is called when the core library has been copied in the release directory.
+    #
+    # Parameters:
+    # * *iRootDir* (_String_): Root directory
+    # * *iReleaseDir* (_String_): Release directory
+    # * *iIncludeRuby* (_Boolean_): Do we include Ruby in the release ?
+    # * *iExecutableInfo* (<em>map<Symbol,Object></em>): The executable information
+    # Return:
+    # * _Boolean_: Success ?
+    def createBinary(iRootDir, iReleaseDir, iIncludeRuby, iExecutableInfo)
+      rSuccess = true
+
+      lBinSubDir = "Launch/#{RUBY_PLATFORM}/bin"
+      lRubyBaseBinName = 'ruby'
+      lBinName = "#{lRubyBaseBinName}-#{RUBY_VERSION}.bin"
+      if (iIncludeRuby)
+        # First create the binary containing all ruby
+        lBinDir = "#{iReleaseDir}/#{lBinSubDir}"
+        FileUtils::mkdir_p(lBinDir)
+        changeDir(lBinDir) do
+          lCmd = "allinoneruby #{lBinName}"
+          rSuccess = system(lCmd)
+          if (!rSuccess)
+            logErr "Error while executing \"#{lCmd}\""
+          end
+        end
+      end
+      if (rSuccess)
+        # Then create the real executable
+        # Generate the Shell file that launches everything for Linux
+        File.open("#{iReleaseDir}/#{iExecutableInfo[:ExeName]}", 'w') do |oFile|
+          oFile << "\#!/bin/sh
+\#--
+\# Copyright (c) 2009-2010 Muriel Salvan (murielsalvan@users.sourceforge.net)
+\# Licensed under the terms specified in LICENSE file. No warranty is provided.
+\#++
+
+\# This file is generated by RubyPackager for Cygwin.
+
+\# This file has to launch the correct binary. There can be several binaries dependending on the configuration.
+\# This is the file that will be created as the executable to launch.
+
+\# Test Ruby's existence
+which ruby >/dev/null 2>/dev/null
+if [ $? == 1 ]
+then
+  echo 'Ruby not found on current platform. Use embedded one.'
+  if [ ! -d tempruby ]
+  then
+    echo 'Extracting Ruby distribution...'
+    mkdir tempruby
+    cd tempruby
+    ../#{lBinSubDir}/#{lBinName} --eee-justextract
+    cd ..
+  fi
+  \# Set the environment correctly to execute Ruby from the extracted dir
+  export LD_LIBRARY_PATH=`pwd`/tempruby/bin:`pwd`/tempruby/lib:`pwd`/tempruby/lib/lib1:`pwd`/tempruby/lib/lib2:`pwd`/tempruby/lib/lib3:`pwd`/tempruby/lib/lib4:${LD_LIRARY_PATH}
+  export RUBYOPT=
+  ./tempruby/bin/ruby -w #{iExecutableInfo[:StartupRBFile]}
+else
+  echo 'Ruby found on current platform. Use it directly.'
+  ruby -w #{iExecutableInfo[:StartupRBFile]}
+fi
+"
+        end
+        File.chmod(0755, "#{iReleaseDir}/#{iExecutableInfo[:ExeName]}")
+      end
+
+      return rSuccess
+    end
+
+  end
+
+end

data/lib/RubyPackager/i386-linux/PlatformReleaser.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2009 Muriel Salvan (murielsalvan@users.sourceforge.net)
+# Copyright (c) 2009-2010 Muriel Salvan (murielsalvan@users.sourceforge.net)
 # Licensed under the terms specified in LICENSE file. No warranty is provided.
 #++
 
@@ -42,39 +42,34 @@ module RubyPackager
     # * *iRootDir* (_String_): Root directory
     # * *iReleaseDir* (_String_): Release directory
     # * *iIncludeRuby* (_Boolean_): Do we include Ruby in the release ?
-    # * *iReleaseInfo* (_ReleaseInfo_): The release information
+    # * *iExecutableInfo* (<em>map<Symbol,Object></em>): The executable information
     # Return:
     # * _Boolean_: Success ?
-    def createBinary(iRootDir, iReleaseDir, iIncludeRuby, iReleaseInfo)
+    def createBinary(iRootDir, iReleaseDir, iIncludeRuby, iExecutableInfo)
       rSuccess = true
 
       lBinSubDir = "Launch/#{RUBY_PLATFORM}/bin"
-      lRubyBaseBinName = nil
-      lRubyLaunchCmd = nil
       lRubyBaseBinName = 'ruby'
-      lRubyLaunchCmd = 'ruby'
       lBinName = "#{lRubyBaseBinName}-#{RUBY_VERSION}.bin"
       if (iIncludeRuby)
         # First create the binary containing all ruby
         lBinDir = "#{iReleaseDir}/#{lBinSubDir}"
         FileUtils::mkdir_p(lBinDir)
-        lOldDir = Dir.getwd
-        Dir.chdir(lBinDir)
-        lCmd = "allinoneruby #{lBinName}"
-        rSuccess = system(lCmd)
-        if (!rSuccess)
-          logErr "Error while executing \"#{lCmd}\""
+        changeDir(lBinDir) do
+          lCmd = "allinoneruby #{lBinName}"
+          rSuccess = system(lCmd)
+          if (!rSuccess)
+            logErr "Error while executing \"#{lCmd}\""
+          end
         end
-        Dir.chdir(lOldDir)
       end
       if (rSuccess)
         # Then create the real executable
         # Generate the Shell file that launches everything for Linux
-        File.open("#{iReleaseDir}/#{iReleaseInfo.ExecutableInfo[:ExeName]}", 'w') do |oFile|
-          oFile << "
-\#!/bin/sh
+        File.open("#{iReleaseDir}/#{iExecutableInfo[:ExeName]}", 'w') do |oFile|
+          oFile << "\#!/bin/sh
 \#--
-\# Copyright (c) 2009 Muriel Salvan (murielsalvan@users.sourceforge.net)
+\# Copyright (c) 2009-2010 Muriel Salvan (murielsalvan@users.sourceforge.net)
 \# Licensed under the terms specified in LICENSE file. No warranty is provided.
 \#++
 
@@ -99,14 +94,14 @@ then
   \# Set the environment correctly to execute Ruby from the extracted dir
   export LD_LIBRARY_PATH=`pwd`/tempruby/bin:`pwd`/tempruby/lib:`pwd`/tempruby/lib/lib1:`pwd`/tempruby/lib/lib2:`pwd`/tempruby/lib/lib3:`pwd`/tempruby/lib/lib4:${LD_LIRARY_PATH}
   export RUBYOPT=
-  ./tempruby/bin/ruby -w #{iReleaseInfo.ExecutableInfo[:StartupRBFile]}
+  ./tempruby/bin/ruby -w #{iExecutableInfo[:StartupRBFile]}
 else
   echo 'Ruby found on current platform. Use it directly.'
-  ruby -w #{iReleaseInfo.ExecutableInfo[:StartupRBFile]}
+  ruby -w #{iExecutableInfo[:StartupRBFile]}
 fi
 "
         end
-        File.chmod(0755, "#{iReleaseDir}/#{iReleaseInfo.ExecutableInfo[:ExeName]}")
+        File.chmod(0755, "#{iReleaseDir}/#{iExecutableInfo[:ExeName]}")
       end
 
       return rSuccess

data/lib/RubyPackager/i386-mswin32/Installers/NSIS.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2009 Muriel Salvan (murielsalvan@users.sourceforge.net)
+# Copyright (c) 2009-2010 Muriel Salvan (murielsalvan@users.sourceforge.net)
 # Licensed under the terms specified in LICENSE file. No warranty is provided.
 #++