irpack 0.2.3 → 0.2.4

data/lib/irpack.rb

@@ -57,10 +57,31 @@ module IRPack
     }.collect {|asm| asm.location }
   end
 
+  def ironruby_standard_library_version
+    ruby_context = binding.clr_member(:LocalScope).call.ruby_context
+    ruby_context.standard_library_version
+  end
+
+  def ironruby_library_path
+    ruby_context = binding.clr_member(:LocalScope).call.ruby_context
+    binpath = ENV[ruby_context.class.bin_dir_environment_variable] ||
+              File.dirname(System::Reflection::Assembly.get_entry_assembly.location)
+    File.expand_path(File.join(binpath, '..', 'Lib'))
+  end
+
+  def ironruby_libraries(dstpath='stdlib', srcpath=ironruby_library_path)
+    res = {}
+    Dir.glob(File.join(srcpath, "{ironruby,ruby/#{ironruby_standard_library_version}}", '**', '*')) do |fn|
+      res[fn] = fn.sub(/^#{srcpath}/, dstpath) if File.file?(fn)
+    end
+    res
+  end
+
   def pack(output_file, files, entry_file, opts={})
     opts = {
       :target           => :exe,
       :compress         => false,
+      :complete         => false,
       :embed_references => true,
       :module_name      => path_to_module_name(output_file)
     }.update(opts)
@@ -71,6 +92,7 @@ module IRPack
     references  = opts[:references] || ironruby_assemblies
     compress    = opts[:compress]
     pack_files  = {}.merge(files)
+    pack_files  = ironruby_libraries.merge(pack_files) if opts[:complete]
     if opts[:embed_references] then
       references.each do |asm|
         pack_files[asm] = File.basename(asm)

data/lib/irpack/application.rb

@@ -31,6 +31,7 @@ module IRPack
       :output_file,
       :target,
       :compress,
+      :complete,
       :embed_references,
       :entry_file,
       :files) do
@@ -40,6 +41,7 @@ module IRPack
         args.output_file = nil
         args.target      = :exe
         args.compress    = false
+        args.complete    = false
         args.embed_references = true
         args.entry_file  = nil
         args.files = {}
@@ -49,6 +51,7 @@ module IRPack
         opt.on('--window',      'Generate window app.') { args.target = :winexe }
         opt.on('--console',     'Generate console app.[default]') { args.target = :exe }
         opt.on('--compress',    'Compress package.') { args.compress = true }
+        opt.on('--complete',    'Embed all standard libraries.') { args.complete = true }
         opt.on('--no-embed',    'Do not embed IronRuby assemblies.') {|v| args.embed_references = v }
         opt.banner = "Usage: #{$0} [options] ENTRYFILE [EMBEDFILES...]"
         opt.parse!(argv)
@@ -79,6 +82,7 @@ module IRPack
         args.entry_file,
         :target => args.target,
         :compress => args.compress,
+        :complete => args.complete,
         :embed_references => args.embed_references)
       return 0
     end

data/lib/irpack/entrypoint.rb

@@ -178,6 +178,8 @@ module IRPack
           runtime_setup.LanguageSetups.Add(IronRuby.Ruby.CreateRubySetup());
           runtime_setup.Options["MainFile"]  = entry_file;
           runtime_setup.Options["Arguments"] = args;
+          runtime_setup.Options["ApplicationBase"] = entry_path;
+          runtime_setup.Options["StandardLibrary"] = Path.Combine(entry_path, "stdlib");
           runtime_setup.HostType = typeof(IRHost);
           runtime_setup.HostArguments = new object[] { package };
           var engine = IronRuby.Ruby.GetEngine(IronRuby.Ruby.CreateRuntime(runtime_setup));

data/lib/irpack/missing.rb

@@ -38,7 +38,7 @@ if not Dir.respond_to?(:mktmpdir) or
     begin
       block.call(path)
     ensure
-      FileUtils.remove_entry(path)
+      FileUtils.remove_entry(path, true)
     end
   end
 end

data/test/test_application.rb

@@ -39,6 +39,7 @@ class TC_ApplicationArguments < Test::Unit::TestCase
     argv = ['entry.rb']
     args = IRPack::Application::Arguments.parse!(argv)
     assert(!args.compress)
+    assert(!args.complete)
     assert(args.embed_references)
     assert_equal(:exe, args.target)
     assert_equal(File.expand_path('entry.exe'), File.expand_path(args.output_file))
@@ -77,6 +78,12 @@ class TC_ApplicationArguments < Test::Unit::TestCase
     assert(args.compress)
   end
 
+  def test_parse_complete
+    argv = ['--complete', 'entry.rb']
+    args = IRPack::Application::Arguments.parse!(argv)
+    assert(args.complete)
+  end
+
   def test_parse_basedir
     argv = [
       '-b', 'foo/bar',

data/test/test_irpack.rb

@@ -46,6 +46,27 @@ class TC_IRPack < Test::Unit::TestCase
     end
   end
 
+  def test_ironruby_library_path_with_env
+    ENV['IRONRUBY_11'] = 'c:/foo/bar/bin'
+    assert_equal('c:/foo/bar/Lib', IRPack.ironruby_library_path)
+  end
+
+  def test_ironruby_library_path_without_env
+    ENV['IRONRUBY_11'] = nil
+    binpath = File.dirname(System::Reflection::Assembly.get_entry_assembly.location)
+    assert_equal(File.expand_path(File.join(binpath, '../Lib')), IRPack.ironruby_library_path)
+  end
+
+  def test_ironruby_libraries
+    libs = IRPack.ironruby_libraries
+    assert(libs.size>0)
+    libs.each do |src, dst|
+      assert_match(/^stdlib\/((ruby\/1\.9\.1|ironruby)\/.+)/, dst)
+      assert_match(/#{$1}$/, src)
+      assert(File.file?(src))
+    end
+  end
+
   def test_pack
     entry = Tempfile.open(File.basename(__FILE__)) do |f|
       f.write <<-RB
@@ -71,5 +92,22 @@ class TC_IRPack < Test::Unit::TestCase
     assert_equal(File.expand_path(outfile), IRPack.pack(outfile, files, 'entry.rb'))
     assert_equal('Hello World!', `#{outfile}`.chomp)
   end
+
+  def test_pack_with_complete
+    entry = Tempfile.open(File.basename(__FILE__)) do |f|
+      f.write <<-RB
+      require 'stringio'
+      io = StringIO.new('Hello')
+      puts io.read
+      RB
+      f.path
+    end
+    files = {
+      entry => 'entry.rb',
+    }
+    outfile = tempfilename('.exe')
+    assert_equal(File.expand_path(outfile), IRPack.pack(outfile, files, 'entry.rb', complete: true))
+    assert_equal('Hello', `#{outfile}`.chomp)
+  end
 end
 

metadata

@@ -2,7 +2,7 @@
 name: irpack
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - kumaryu
@@ -10,7 +10,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-04 00:00:00 Z
+date: 2011-10-22 00:00:00 +09:00
+default_executable: 
 dependencies: []
 
 description: |
@@ -41,6 +42,7 @@ files:
 - test/test_missing.rb
 - test/test_packager.rb
 - test/utils.rb
+has_rdoc: true
 homepage: http://github.com/kumaryu/irpack
 licenses: []
 
@@ -64,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Generate a standalone executable file from IronRuby scripts.