ocra 1.3.0.rc1 → 1.3.0.rc2

data/History.txt

@@ -1,4 +1,4 @@
-=== 1.3.0.rc1
+=== 1.3.0
 
 * Fixed some additional corner cases with absolute and relative
   require & load paths. Extended test suite to cover a lot more

data/README.rdoc

@@ -47,23 +47,62 @@ dependencies (gems and DLLs) into an executable named
 
   ocra --help
 
-  --dll dllname    Include additional DLLs from the Ruby bindir.
-  --no-lzma        Disable LZMA compression of the executable.
-  --no-dep-run     Don't run script.rb to check for dependencies.
-  --add-all-core   Add all core ruby libraries to the executable.
-  --output <file>  Name the exe to generate. Defaults to ./<scriptname>.exe.
-  --gemfile <file> Add all gems and dependencies listed in a Bundler Gemfile.
-  --quiet          Suppress output while building executable.
-  --verbose        Show extra output while building executable.
-  --debug          Executable will be verbose.
-  --debug-extract  Executable will unpack to local dir and not delete after.
-  --help           Display this information.
-  --windows        Force Windows application (rubyw.exe)
-  --console        Force console application (ruby.exe)
-  --no-autoload    Don't load/include script.rb's autoloads.
-  --icon <ico>     Replace icon with a custom one.
-  --version        Display version number and exit.
-  --no-gem-filter  Don't filter readme's, doc, C-source, etc. from gems.
+Ocra options:
+
+--help             Display this information.
+--quiet            Suppress output while building executable.
+--verbose          Show extra output while building executable.
+--version          Display version number and exit.
+
+Packaging options:
+
+--dll dllname      Include additional DLLs from the Ruby bindir.
+--add-all-core     Add all core ruby libraries to the executable.
+--gemfile <file>   Add all gems and dependencies listed in a Bundler Gemfile.
+--no-enc           Exclude encoding support files
+
+Gem content detection modes:
+
+--gem-minimal[=gem1,..]  Include only loaded scripts
+--gem-guess=[gem1,...]   Include loaded scripts & best guess (DEFAULT)
+--gem-all[=gem1,..]      Include all scripts & files
+--gem-full[=gem1,..]     Include EVERYTHING
+--gem-spec[=gem1,..]     Include files in gemspec (Does not work with Rubygems 1.7+)
+
+  minimal: loaded scripts
+  guess: loaded scripts and other files
+  all: loaded scripts, other scripts, other files (except extras)
+  full: Everything found in the gem directory
+
+--[no-]gem-scripts[=..]  Other script files than those loaded
+--[no-]gem-files[=..]    Other files (e.g. data files)
+--[no-]gem-extras[=..]   Extra files (README, etc.)
+
+  scripts: .rb/.rbw files
+  extras: C/C++ sources, object files, test, spec, README
+  files: all other files
+
+Auto-detection options:
+
+--no-dep-run       Don't run script.rb to check for dependencies.
+--no-autoload      Don't load/include script.rb's autoloads.
+--no-autodll       Disable detection of runtime DLL dependencies.
+
+Output options:
+
+--output <file>    Name the exe to generate. Defaults to ./<scriptname>.exe.
+--no-lzma          Disable LZMA compression of the executable.
+--innosetup <file> Use given Inno Setup script (.iss) to create an installer.
+
+Executable options:
+
+--windows          Force Windows application (rubyw.exe)
+--console          Force console application (ruby.exe)
+--chdir-first      When exe starts, change working directory to app dir.
+--icon <ico>       Replace icon with a custom one.
+--debug            Executable will be verbose.
+--debug-extract    Executable will unpack to local dir and not delete after.
+
   
 === Compilation:
 
@@ -167,11 +206,11 @@ your script. Otherwise, OCRA won't know about it and will not include
 the source files.
 
 RubyGems are handled specially. Whenever a file from a Gem is
-detected, OCRA will attempt to include all the files from that
-specific Gem (all files listed in the manifest), expect some unlikely
-needed files such as readme's and other documentation. This latter can
-be overruled using the "<tt>--no-gem-filter</tt>" which will make OCRA
-include every file that is listed in the Gem's manifest.
+detected, OCRA will attempt to include all the required files from
+that specific Gem, expect some unlikely needed files such as readme's
+and other documentation. This behaviour can be controlled by using the
+--gem-* options. Behaviour can be changed for all gems or specific
+gems using --gem-*=gemname.
 
 Libraries found in non-standard path (for example, if you invoke OCRA
 with "ruby -I some/path") will be placed into the site dir
@@ -201,7 +240,7 @@ build process. You will also probably need to use the --add-all-core
 option to include the Ruby core libraries.
 
 If your app uses gems, then you can specify them in a
-Bundler (http://gembundler.com/) Gemfile, then use the --gemfile
+Bundler (http://gembundler.com) Gemfile, then use the --gemfile
 option to supply it to Ocra. Ocra will automatically include all
 gems specified, and all their dependencies.
 
@@ -214,12 +253,74 @@ directory "someapp" and create an exe named "someapp.exe", without
 actually running the app during the build, you could use the
 following command:
 
-  ocra someapp/script/server someapp --no-dep-run --add-all-core --gemfile someapp/Gemfile
+  ocra someapp/script/rails someapp --output someapp.exe --add-all-core \
+  --gemfile someapp/Gemfile --no-dep-run --chdir-first -- server
+
+Note the space between "--" and "server"! It's important; "server" is an argument to be passed to rails when the script is ran.
 
 Rails 2 apps can be packaged similarly, though you will have to
 integrate them with Bundler (http://gembundler.com/rails23.html)
 first.
 
+=== Gem handling
+
+By default, Ocra includes all scripts that are loaded by your script
+when it is run before packaging. Ocra detects which gems are using and
+includes any additional non-script files from those gems, except
+trivial files such as C/C++ source code, object files, READMEs, unit
+tests, specs, etc.
+
+This behaviour can be changed by using the --gem-* options. There are
+four possible modes:
+
+  minimal: Include only loaded scripts
+  guess: Include loaded scripts and important files (DEFAULT)
+  all: Include all scripts and important files
+  full: Include all files
+
+If you find that files are missing from the resulting executable, try
+first with --gem-all=gemname for the gem that is missing, and if that
+does not work, try --gem-full=gemname. The paranoid can use --gem-full
+to include all files for all required gems.
+
+=== Creating an installer for your application
+
+To make your application start up quicker, or to allow it to
+keep files in its application directory between runs, or if
+you just want to make your program seem more like a "regular"
+Windows application, you can have Ocra generate an installer
+for your app with the free Inno Setup software.
+
+You will first have to download and install Inno Setup 5 or
+later, and also add its directory to your PATH (so that Ocra
+can find the ISCC compiler program). Once you've done that,
+you can use the --innosetup option to Ocra to supply an
+Inno Setup script. Do not add any [Files] or [Dirs] sections
+to the script; Ocra will figure those out itself.
+
+To continue the Rails example above, let's package the Rails 3
+app into an installer. Save the following as "<tt>someapp.iss</tt>":
+
+  [Setup]
+  AppName=SomeApp
+  AppVersion=0.1
+  DefaultDirName={pf}\SomeApp
+  DefaultGroupName=SomeApp
+  OutputBaseFilename=SomeAppInstaller
+
+  [Icons]
+  Name: "{group}\SomeApp"; Filename: "{app}\someapp.exe"
+  Name: "{group}\Uninstall SomeApp"; Filename: "{uninstallexe}"
+
+Then, run Ocra with this command:
+
+  ocra someapp/script/rails someapp --output someapp.exe --add-all-core \
+  --gemfile someapp/Gemfile --no-dep-run --chdir-first --no-lzma \
+  --innosetup someapp.iss -- server
+
+If all goes well, a file named "SomeAppInstaller.exe" will be placed
+into the Output directory.
+
 === Environment variables
 
 OCRA executables clear the RUBYLIB environment variable before your
@@ -239,7 +340,7 @@ executable, for example
 === Working directory
 
 The OCRA executable does not change the working directory when it is
-launched.
+launched, unless you use the "<tt>--chdir-first</tt>" option.
 
 You should not assume that the current working directory when invoking
 an executable built with .exe is the location of the source script. It
@@ -247,9 +348,13 @@ can be the directory where the executable is placed (when invoked
 through the Windows Explorer), the users' current working directory
 (when invoking from the Command Prompt), or even
 <tt>C:\\WINDOWS\\SYSTEM32</tt> when the executable is invoked through
-a file association. You can optionally change the directory yourself:
+a file association.
 
-  Dir.chdir File.dirname($0)
+With the "<tt>--chdir-first</tt>" option, the working directory will
+always be the common parent directory of your source files. This
+should be fine for most applications. However, if your application
+is designed to run from the command line and take filenames as
+arguments, then you cannot use this option.
 
 If you wish to maintain the user's working directory, but need to
 'require' additional Ruby scripts from the source directory, you can

data/bin/ocra

@@ -54,8 +54,16 @@ module Ocra
       src_normalized =~ /^#{Regexp.escape tgt_normalized}#{SEPARATOR_PAT}/i
     end
 
+    # Join two pathnames together. Returns the right-hand side if it
+    # is an absolute path. Otherwise, returns the full path of the
+    # left + right.
     def /(other)
-      Ocra.Pathname(@path + '/' + Ocra.Pathname(other).path)
+      other = Ocra.Pathname(other)
+      if other.absolute?
+        other
+      else
+        Ocra.Pathname(@path + '/' + other.path)
+      end
     end
     
     def append_to_filename!(s)
@@ -74,6 +82,30 @@ module Ocra
       Pathname.pathequal(ext, expected_ext)
     end
 
+    def entries
+      Dir.entries(@path).map { |e| self / e }
+    end
+
+    # Recursively find all files which match a specified regular
+    # expression.
+    def find_all_files(re)
+      entries.map do |pn|
+        if pn.directory?
+          if pn.basename =~ /^\.\.?$/
+            []
+          else
+            pn.find_all_files(re)
+          end
+        elsif pn.file?
+          if pn.basename =~ re
+            pn
+          else
+            []
+          end
+        end
+      end.flatten
+    end
+
     def ==(other); to_posix.downcase == other.to_posix.downcase; end
     def =~(o); @path =~ o; end
     def <=>(other); @path.casecmp(other.path); end
@@ -84,6 +116,7 @@ module Ocra
     def dirname; Pathname.new(File.dirname(@path)); end
     def basename; Pathname.new(File.basename(@path)); end
     def expand(dir = nil); Pathname.new(File.expand_path(@path, dir && Ocra.Pathname(dir))); end
+    def size; File.size(@path); end
 
     alias to_s to_posix
     alias to_str to_posix
@@ -142,22 +175,25 @@ module Ocra
     a.sort.inject([]) { |r, e| r.last == e ? r : r << e }
   end
   
-  VERSION = "1.3.0.rc1"
+  VERSION = "1.3.0.rc2"
 
   IGNORE_MODULES = /^enumerator.so$/
 
-  IGNORE_GEMFILES = %r{(
+  GEM_SCRIPT_RE = /\.rbw?$/
+  GEM_EXTRA_RE = %r{(
     # Auxiliary files in the root of the gem
     ^(\.\/)?(History|Install|Manifest|README|Licen[sc]e|Contributors|ChangeLog|BSD|GPL).*$ |
     # Installation files in the root of the gem
     ^(\.\/)?(Rakefile|setup.rb|extconf.rb)$ |
     # Documentation/test directories in the root of the gem
-    ^(\.\/)?(doc|ext|examples|test|tests|benchmarks)\/ |
+    ^(\.\/)?(doc|ext|examples|test|tests|benchmarks|spec)\/ |
     # Directories anywhere
     (^|\/)(\.autotest|\.svn|\.cvs|\.git)(\/|$) |
     # Unlikely extensions
-    \.(rdoc)$/
+    \.(rdoc|c|cpp|c++|cxx|h|hxx|hpp|obj|o|a)$/
   )}xi
+  
+  GEM_NON_FILE_RE = /(#{GEM_EXTRA_RE}|#{GEM_SCRIPT_RE})/
 
   # Alias for the temporary directory where files are extracted.
   TEMPDIR_ROOT = Pathname.new("\xFF")
@@ -176,18 +212,21 @@ module Ocra
     :add_all_core => false,
     :output_override => nil,
     :load_autoload => true,
+    :chdir_first => false,
     :force_windows => false,
     :force_console => false,
     :icon_filename => nil,
     :gemfile => nil,
+    :inno_script => nil,
     :quiet => false,
     :verbose => false,
     :autodll => true,
     :show_warnings => true,
     :debug => false,
     :debug_extract => false,
-    :gem_filter => true,
-    :arg => []
+    :arg => [],
+    :enc => true,
+    :gem => []
   }
 
   @options.each_key { |opt| eval("def self.#{opt}; @options[:#{opt}]; end") }
@@ -256,23 +295,61 @@ module Ocra
     usage = <<EOF
 ocra [options] script.rb
 
---dll dllname    Include additional DLLs from the Ruby bindir.
---no-lzma        Disable LZMA compression of the executable.
---no-dep-run     Don't run script.rb to check for dependencies.
---add-all-core   Add all core ruby libraries to the executable.
---output <file>  Name the exe to generate. Defaults to ./<scriptname>.exe.
---gemfile <file> Add all gems and dependencies listed in a Bundler Gemfile.
---quiet          Suppress output while building executable.
---verbose        Show extra output while building executable.
---debug          Executable will be verbose.
---debug-extract  Executable will unpack to local dir and not delete after.
---help           Display this information.
---windows        Force Windows application (rubyw.exe)
---console        Force console application (ruby.exe)
---no-autoload    Don't load/include script.rb's autoloads.
---icon <ico>     Replace icon with a custom one.
---version        Display version number and exit.
---no-gem-filter  Don't filter readme's, doc, C-source, etc. from gems.
+Ocra options:
+
+--help             Display this information.
+--quiet            Suppress output while building executable.
+--verbose          Show extra output while building executable.
+--version          Display version number and exit.
+
+Packaging options:
+
+--dll dllname      Include additional DLLs from the Ruby bindir.
+--add-all-core     Add all core ruby libraries to the executable.
+--gemfile <file>   Add all gems and dependencies listed in a Bundler Gemfile.
+--no-enc           Exclude encoding support files
+
+Gem content detection modes:
+
+--gem-minimal[=gem1,..]  Include only loaded scripts
+--gem-guess=[gem1,...]   Include loaded scripts & best guess (DEFAULT)
+--gem-all[=gem1,..]      Include all scripts & files
+--gem-full[=gem1,..]     Include EVERYTHING
+--gem-spec[=gem1,..]     Include files in gemspec (Does not work with Rubygems 1.7+)
+
+  minimal: loaded scripts
+  guess: loaded scripts and other files
+  all: loaded scripts, other scripts, other files (except extras)
+  full: Everything found in the gem directory
+
+--[no-]gem-scripts[=..]  Other script files than those loaded
+--[no-]gem-files[=..]    Other files (e.g. data files)
+--[no-]gem-extras[=..]   Extra files (README, etc.)
+
+  scripts: .rb/.rbw files
+  extras: C/C++ sources, object files, test, spec, README
+  files: all other files
+
+Auto-detection options:
+
+--no-dep-run       Don't run script.rb to check for dependencies.
+--no-autoload      Don't load/include script.rb's autoloads.
+--no-autodll       Disable detection of runtime DLL dependencies.
+
+Output options:
+
+--output <file>    Name the exe to generate. Defaults to ./<scriptname>.exe.
+--no-lzma          Disable LZMA compression of the executable.
+--innosetup <file> Use given Inno Setup script (.iss) to create an installer.
+
+Executable options:
+
+--windows          Force Windows application (rubyw.exe)
+--console          Force console application (ruby.exe)
+--chdir-first      When exe starts, change working directory to app dir.
+--icon <ico>       Replace icon with a custom one.
+--debug            Executable will be verbose.
+--debug-extract    Executable will unpack to local dir and not delete after.
 EOF
 
     while arg = argv.shift
@@ -297,12 +374,17 @@ EOF
         @options[:force_console] = true
       when /\A--no-autoload\z/
         @options[:load_autoload] = false
+      when /\A--chdir-first\z/
+        @options[:chdir_first] = true
       when /\A--icon\z/
         @options[:icon_filename] = Pathname(argv.shift)
         Ocra.fatal_error "Icon file #{icon_filename} not found.\n" unless icon_filename.exist?
       when /\A--gemfile\z/
         @options[:gemfile] = Pathname(argv.shift)
         Ocra.fatal_error "Gemfile #{gemfile} not found.\n" unless gemfile.exist?
+      when /\A--innosetup\z/
+        @options[:inno_script] = Pathname(argv.shift)
+        Ocra.fatal_error "Inno Script #{inno_script} not found.\n" unless inno_script.exist?
       when /\A--no-autodll\z/
         @options[:autodll] = false
       when /\A--version\z/
@@ -314,11 +396,15 @@ EOF
         @options[:debug] = true
       when /\A--debug-extract\z/
         @options[:debug_extract] = true
-      when /\A--no-gem-filter\z/
-        @options[:gem_filter] = false
       when /\A--\z/
         @options[:arg] = ARGV.dup
         ARGV.clear
+      when /\A--(no-)?enc\z/
+        @options[:enc] = !$1
+      when /\A--(no-)?gem-(\w+)(?:=(.*))?$/
+        negate, group, list = $1, $2, $3
+        @options[:gem] ||= []
+        @options[:gem] << [negate, group.to_sym, list && list.split(",") ]
       when /\A--help\z/, /\A--./
         puts usage
         exit 0
@@ -327,6 +413,18 @@ EOF
       end
     end
 
+    if Ocra.debug_extract && Ocra.inno_script
+      Ocra.fatal_error "The --debug-extract option conflicts with use of Inno Setup"
+    end
+
+    if Ocra.lzma_mode && Ocra.inno_script
+      Ocra.fatal_error "LZMA compression must be disabled (--no-lzma) when using Inno Setup"
+    end
+
+    if !Ocra.chdir_first && Ocra.inno_script
+      Ocra.fatal_error "Chdir-first mode must be enabled (--chdir-first) when using Inno Setup"
+    end
+
     if files.empty?
       puts usage
       exit 1
@@ -422,7 +520,13 @@ EOF
         srcroot
       end
     end
-    src_files = src_files.map { |file| file.relative_path_from(src_prefix) }
+    src_files = src_files.map do |file|
+      if file.subpath?(src_prefix)
+        file.relative_path_from(src_prefix)
+      else
+        file
+      end
+    end
     return src_prefix, src_files
   end
 
@@ -478,24 +582,86 @@ EOF
         gemspecpath = gempath / 'specifications' / "#{fullgemname}.gemspec"
         @gemspecs << gemspecpath
         spec = Gem::Specification.load(gemspecpath)
-        Ocra.msg "Will include gem #{spec.full_name}"
-
-        # Get list of files
-        files = Pathname(spec.files)
-        # Filter out some unlikely files (Readme, etc.)
-        files = files.select { |filename| filename !~ IGNORE_GEMFILES } if Ocra.gem_filter
-        # Find the full path
-        files = files.map { |file| (gempath / "gems" / fullgemname / file).expand }
-        # Filter out non-files
-        files = files.select { |file| file.file? }
-        
-        gem_files += files
+
+        # Determine which set of files to include for this particular gem
+        include = [ :loaded, :files ]
+        Ocra.gem.each do |negate, option, list|
+          if list.nil? or list.include?(spec.name)
+            case option
+            when :minimal
+              include = [ :loaded ]
+            when :guess
+              include = [ :loaded, :files ]
+            when :all
+              include = [ :scripts, :files ]
+            when :full
+              include = [ :scripts, :files, :extras ]
+            when :spec
+              include = [ :spec ]
+            when :scripts
+              if negate
+                include.delete(:scripts)
+              else
+                include.push(:scripts)
+              end
+            when :files
+              if negate
+                include.delete(:files)
+              else
+                include.push(:files)
+              end
+            when :extras
+              if negate
+                include.delete(:extras)
+              else
+                include.push(:extras)
+              end
+            end
+          end
+        end
+
+        Ocra.msg "Detected gem #{spec.full_name} (#{include.join(', ')})"
+
+        gem_root = gempath / "gems" / spec.full_name
+        gem_root_files = nil
+        files = []
+
+        # Find the selected files
+        include.each do |set|
+          case set
+          when :spec
+            files << Pathname(spec.files)
+          when :loaded
+            files << features_from_gems.select { |feature| feature.subpath?(gem_root) }
+          when :files
+            gem_root_files ||= gem_root.find_all_files(//)
+            files << gem_root_files.select { |path| path.relative_path_from(gem_root) !~ GEM_NON_FILE_RE }
+          when :extra
+            gem_root_files ||= gem_root.find_all_files(//)
+            files << gem_root_files.select { |path| path.relative_path_from(gem_root) =~ GEM_EXTRA_RE }
+          when :scripts
+            gem_root_files ||= gem_root.find_all_files(//)
+            files << gem_root_files.select { |path| path.relative_path_from(gem_root) =~ GEM_SCRIPT_RE }
+          end
+        end
+
+        files.flatten!
+        actual_files = files.select { |file| file.file? }
+
+        (files - actual_files).each do |missing_file|
+          Ocra.warn "#{missing_file} was not found"
+        end
+
+        total_size = actual_files.inject(0) { |size, path| size + path.size }
+        Ocra.msg "\t#{actual_files.size} files, #{total_size} bytes"
+
+        gem_files += actual_files
       end
       gem_files = sort_uniq(gem_files)
-      features -= features_from_gems # FIXME Isn't this duplicated by caller?
     else
       gem_files = []
     end
+    features_from_gems -= gem_files
     return gem_files, features_from_gems
   end
   
@@ -538,6 +704,23 @@ EOF
     # Find the source root and adjust paths
     src_prefix, src_files = find_src_root(Ocra.files)
 
+    # Include encoding support files
+    if Ocra.enc
+      all_load_paths.each do |path|
+        if path.subpath?(Host.exec_prefix)
+          encpath = path / "enc"
+          if encpath.exist?
+            encfiles = encpath.find_all_files(/\.so$/)
+            size = encfiles.inject(0) { |sum,pn| sum + pn.size }
+            Ocra.msg "Including #{encfiles.size} encoding support files (#{size} bytes, use --no-enc to exclude)"
+            features.push(*encfiles)
+          end
+        end
+      end
+    else
+      Ocra.msg "Not including encoding support files"
+    end
+
     # Find features and decide where to put them in the temporary
     # directory layout.
     libs = []
@@ -713,15 +896,16 @@ EOF
       sb.setenv('GEM_PATH', (TEMPDIR_ROOT / GEMHOMEDIR).to_native)
 
       # Add the opcode to launch the script
-      extra_arg = Ocra.arg.map { |arg| ' "' + arg.gsub(/\"/,'\\"') + '"' }.join
+      extra_arg = Ocra.arg.map { |arg| ' "' + arg.gsub("\"","\\\"") + '"' }.join
       installed_ruby_exe = TEMPDIR_ROOT / BINDIR / rubyexe
       launch_script = (TEMPDIR_ROOT / target_script).to_native
       sb.postcreateprocess(installed_ruby_exe,
         "#{rubyexe} \"#{launch_script}\"#{extra_arg}")
-      
-      Ocra.msg "Compressing" unless not Ocra.lzma_mode
     end
-    Ocra.msg "Finished building #{executable} (#{File.size(executable)} bytes)"
+
+    unless Ocra.inno_script
+      Ocra.msg "Finished building #{executable} (#{File.size(executable)} bytes)"
+    end
   end
 
   module LibraryDetector
@@ -797,7 +981,6 @@ EOF
       opcode_offset = File.size(path)
 
       File.open(path, "ab") do |ocrafile|
-        
         if Ocra.lzma_mode
           @of = ""
         else
@@ -805,16 +988,18 @@ EOF
         end
 
         if Ocra.debug
+          Ocra.msg("Enabling debug mode in executable")
           ocrafile.write([OP_ENABLE_DEBUG_MODE].pack("V"))
         end
 
-        createinstdir Ocra.debug_extract, !Ocra.debug_extract
+        createinstdir Ocra.debug_extract, !Ocra.debug_extract, Ocra.chdir_first
 
         yield(self)
 
-        if Ocra.lzma_mode
+        if Ocra.lzma_mode and not Ocra.inno_script
           begin
             File.open("tmpin", "wb") { |tmp| tmp.write(@of) }
+            Ocra.msg "Compressing #{@of.size} bytes"
             system("\"#{Ocra.lzmapath}\" e tmpin tmpout 2>NUL") or fail
             compressed_data = File.open("tmpout", "rb") { |tmp| tmp.read }
             ocrafile.write([OP_DECOMPRESS_LZMA, compressed_data.size, compressed_data].pack("VVA*"))
@@ -822,21 +1007,68 @@ EOF
             File.unlink("tmpin") if File.exist?("tmpin")
             File.unlink("tmpout") if File.exist?("tmpout")
           end
-        else
-          ocrafile.write(@of) if Ocra.lzma_mode
         end
 
         ocrafile.write([OP_END].pack("V"))
         ocrafile.write([opcode_offset].pack("V")) # Pointer to start of opcodes
         ocrafile.write(Signature.pack("C*"))
       end
+
+      if Ocra.inno_script
+        begin
+          iss = File.read(Ocra.inno_script) + "\n\n"
+
+          iss << "[Dirs]\n"
+          @paths.each_key do |p|
+            iss << "Name: \"{app}/#{p}\"\n"
+          end
+          iss << "\n"
+
+          iss << "[Files]\n"
+          path_escaped = path.to_s.gsub('"', '""')
+          iss << "Source: \"#{path_escaped}\"; DestDir: \"{app}\"\n"
+          @files.each do |tgt, src|
+            src_escaped = src.to_s.gsub('"', '""')
+            target_dir_escaped = Pathname.new(tgt).dirname.to_s.gsub('"', '""')
+            iss << "Source: \"#{src_escaped}\"; DestDir: \"{app}/#{target_dir_escaped}\"\n"
+          end
+          iss << "\n"
+
+          Ocra.verbose_msg "### INNOSETUP SCRIPT ###\n\n#{iss}\n\n"
+
+          f = File.open("ocratemp.iss", "w")
+          f.write(iss)
+          f.close()
+
+          iscc_cmd = ["iscc"]
+          iscc_cmd << "/Q" unless Ocra.verbose
+          iscc_cmd << "ocratemp.iss"
+          Ocra.msg "Running InnoSetup compiler ISCC"
+          result = system(*iscc_cmd)
+          if not result
+            case $?
+              when 0 then raise RuntimeError.new("ISCC reported success, but system reported error?")
+              when 1 then raise RuntimeError.new("ISCC reports invalid command line parameters")
+              when 2 then raise RuntimeError.new("ISCC reports that compilation failed")
+              else raise RuntimeError.new("ISCC failed to run. Is the InnoSetup directory in your PATH?")
+            end
+          end
+        rescue Exception => e
+          Ocra.fatal_error("InnoSetup installer creation failed: #{e.message}")
+        ensure
+          File.unlink("ocratemp.iss") if File.exist?("ocratemp.iss")
+          File.unlink(path) if File.exist?(path)
+        end
+      end
     end
 
     def mkdir(path)
       return if @paths[path.path.downcase]
       @paths[path.path.downcase] = true
       Ocra.verbose_msg "m #{showtempdir path}"
-      @of << [OP_CREATE_DIRECTORY, path.to_native].pack("VZ*")
+      unless Ocra.inno_script # The directory will be created by InnoSetup with a [Dirs] statement
+        @of << [OP_CREATE_DIRECTORY, path.to_native].pack("VZ*")
+      end
     end
 
     def ensuremkdir(tgt)
@@ -848,18 +1080,22 @@ EOF
       end
     end
 
-    def createinstdir(next_to_exe = false, delete_after = false)
-      @of << [OP_CREATE_INST_DIRECTORY, next_to_exe ? 1 : 0, delete_after ? 1 : 0].pack("VVV")
+    def createinstdir(next_to_exe = false, delete_after = false, chdir_before = false)
+      unless Ocra.inno_script # Creation of installation directory will be handled by InnoSetup
+        @of << [OP_CREATE_INST_DIRECTORY, next_to_exe ? 1 : 0, delete_after ? 1 : 0, chdir_before ? 1 : 0].pack("VVVV")
+      end
     end
 
     def createfile(src, tgt)
       return if @files[tgt]
-      @files[tgt] = true
+      @files[tgt] = src
       src, tgt = Ocra.Pathname(src), Ocra.Pathname(tgt)
       ensuremkdir(tgt.dirname)
       str = File.open(src, "rb") { |file| file.read }
       Ocra.verbose_msg "a #{showtempdir tgt}"
-      @of << [OP_CREATE_FILE, tgt.to_native, str.size, str].pack("VZ*VA*")
+      unless Ocra.inno_script # InnoSetup will install the file with a [Files] statement
+        @of << [OP_CREATE_FILE, tgt.to_native, str.size, str].pack("VZ*VA*")
+      end
     end
 
     def createprocess(image, cmdline)

data/lib/ocra.rb

@@ -1,3 +1,3 @@
 class Ocra
-  VERSION = '1.3.0.rc1'
+  VERSION = '1.3.0.rc2'
 end

data/test/test_ocra.rb

@@ -682,6 +682,27 @@ class TestOcra < Test::Unit::TestCase
     end
   end
 
+  # Test that the --chdir-first option changes directory before exe starts script
+  def test_chdir_first
+    with_fixture 'writefile' do
+      # Control test; make sure the writefile script works as expected under default options 
+      assert system("ruby", ocra, "writefile.rb", *(DefaultArgs))
+      pristine_env "writefile.exe" do
+        assert !File.exist?("output.txt")
+        assert system("writefile.exe")
+        assert File.exist?("output.txt")
+      end
+      
+      assert system("ruby", ocra, "writefile.rb", *(DefaultArgs + ["--chdir-first"]))
+      pristine_env "writefile.exe" do
+        assert !File.exist?("output.txt")
+        assert system("writefile.exe")
+        # If the script ran in its inst directory, then our working dir still shouldn't have any output.txt
+        assert !File.exist?("output.txt")
+      end
+    end
+  end
+
   # Would be nice if OCRA could build from source located beneath the
   # Ruby installation too.
   def test_exec_prefix
@@ -694,5 +715,18 @@ class TestOcra < Test::Unit::TestCase
       end
     end
   end
+
+  def test_explicit_in_exec_prefix
+    path = File.join(RbConfig::CONFIG["exec_prefix"], "include", "**", "*.h")
+    number_of_files = Dir[path].size
+    assert number_of_files > 3
+    with_fixture "check_includes" do
+      assert system("ruby", ocra, "check_includes.rb", path, *DefaultArgs)
+      assert File.exist?("check_includes.exe")
+      pristine_env "check_includes.exe" do
+        assert system("check_includes.exe", number_of_files.to_s)
+      end
+    end
+  end
   
 end

metadata

@@ -1,68 +1,40 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ocra
-version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-  - 1
-  - 3
-  - 0
-  - rc1
-  version: 1.3.0.rc1
+version: !ruby/object:Gem::Version
+  version: 1.3.0.rc2
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Lars Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-12-19 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rubyforge
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 4
-        version: 2.0.4
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+date: 2011-05-28 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: hoe
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &7482744 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 6
-        - 1
-        version: 2.6.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.9.4
   type: :development
-  version_requirements: *id002
-description: |-
-  OCRA (One-Click Ruby Application) builds Windows executables from Ruby
-  source code. The executable is a self-extracting, self-running
-  executable that contains the Ruby interpreter, your source code and
-  any additionally needed ruby libraries or DLL.
+  prerelease: false
+  version_requirements: *7482744
+description: ! "OCRA (One-Click Ruby Application) builds Windows executables from
+  Ruby\r\nsource code. The executable is a self-extracting, self-running\r\nexecutable
+  that contains the Ruby interpreter, your source code and\r\nany additionally needed
+  ruby libraries or DLL."
 email: larsch@belunktum.dk
-executables: 
+executables:
 - ocra
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - README.rdoc
-files: 
+files:
 - History.txt
 - Manifest.txt
 - README.rdoc
@@ -74,40 +46,33 @@ files:
 - share/ocra/edicon.exe
 - test/test_ocra.rb
 - lib/ocra.rb
-has_rdoc: true
+- .gemtest
 homepage: http://ocra.rubyforge.org/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-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: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: ocra
-rubygems_version: 1.3.7
+rubygems_version: 1.8.4
 signing_key: 
 specification_version: 3
-summary: OCRA (One-Click Ruby Application) builds Windows executables from Ruby
 source code
-test_files: 
+summary: ! "OCRA (One-Click Ruby Application) builds Windows executables from Ruby\r
+  source code"
+test_files:
 - test/test_ocra.rb