macruby-changes

Download

macruby-changes@lists.macosforge.org

February 2011

1 participants
32 discussions

[5218] MacRuby/trunk/spec
by source_changes＠macosforge.org 02 Feb '11

02 Feb '11

Revision: 5218 http://trac.macosforge.org/projects/ruby/changeset/5218 Author: watson1978(a)gmail.com Date: 2011-02-02 06:01:33 -0800 (Wed, 02 Feb 2011) Log Message: ----------- Updated the spec's tags. Modified Paths: -------------- MacRuby/trunk/spec/frozen/tags/macruby/core/array/pack/c_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/array/product_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/dir/close_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/encoding/find_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/file/new_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/integer/chr_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/kernel/__method___tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/kernel/comparison_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/kernel/puts_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/module/class_variable_set_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/module/method_defined_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/module/public_method_defined_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/objectspace/each_object_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/string/encoding_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/string/initialize_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/string/ord_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/string/setbyte_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/string/unpack_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/threadgroup/add_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/language/next_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/language/predefined_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/library/erb/util/u_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/library/socket/basicsocket/getsockname_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/library/socket/socket/connect_nonblock_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/library/socket/socket/getnameinfo_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/library/stringio/puts_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/library/stringscanner/get_byte_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/library/stringscanner/getbyte_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/library/timeout/timeout_tags.txt Added Paths: ----------- MacRuby/trunk/spec/macruby/tags/macruby/core/objc_tags.txt Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/array/pack/c_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/array/pack/c_tags.txt 2011-02-01 01:42:31 UTC (rev 5217) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/array/pack/c_tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -2,4 +2,3 @@ fails:Array#pack with format 'C' encodes the least significant eight bits of a negative number fails:Array#pack with format 'c' encodes the least significant eight bits of a positive number fails:Array#pack with format 'c' encodes the least significant eight bits of a negative number -fails:Array#pack with format 'c' calls #to_str to coerce the directives string Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/array/product_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/array/product_tags.txt 2011-02-01 01:42:31 UTC (rev 5217) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/array/product_tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -1 +0,0 @@ -fails:Array#product when given an empty block returns self Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/dir/close_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/dir/close_tags.txt 2011-02-01 01:42:31 UTC (rev 5217) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/dir/close_tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -1 +0,0 @@ -fails:Dir#close closes the stream and fd and returns nil Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/encoding/find_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/encoding/find_tags.txt 2011-02-01 01:42:31 UTC (rev 5217) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/encoding/find_tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -1,4 +1,3 @@ -fails:Encoding.find accepts any object as encoding name, if it responds to #to_str fails:Encoding.find returns default external encoding for the 'external' encoding alias fails:Encoding.find returns default internal encoding for the 'internal' encoding alias fails:Encoding.find uses default external encoding for the 'filesystem' encoding alias Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/file/new_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/file/new_tags.txt 2011-02-01 01:42:31 UTC (rev 5217) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/file/new_tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -1,3 +1 @@ -fails:File.new returns a new File with modus fd -fails:File.new raises an Errno::EBADF if the first parameter is an invalid file descriptor fails:File.new can't alter mode or permissions when opening a file Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/integer/chr_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/integer/chr_tags.txt 2011-02-01 01:42:31 UTC (rev 5217) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/integer/chr_tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -1,4 +1,3 @@ -fails:Integer#chr without argument interprets self as a codepoint in the corresponding character set fails:Integer#chr without argument raises a RangeError is self is greater than 255 and the internal encoding is nil fails:Integer#chr without argument infers the encoding from Encoding.default_internal fails:Integer#chr with an encoding argument accepts an Encoding object as an argument Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/kernel/__method___tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/kernel/__method___tags.txt 2011-02-01 01:42:31 UTC (rev 5217) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/kernel/__method___tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -1,4 +1,3 @@ -fails:Kernel.__method__ returns the current method, even when aliased fails:Kernel.__method__ returns the original name when aliased method fails:Kernel.__method__ returns the caller from blocks too fails:Kernel.__method__ returns the caller from block inside define_method too Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/kernel/comparison_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/kernel/comparison_tags.txt 2011-02-01 01:42:31 UTC (rev 5217) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/kernel/comparison_tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -1,2 +0,0 @@ -fails:Kernel#<=> returns 0 if self is == to the argument -fails:Kernel#<=> returns nil if self.==(arg) returns nil Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/kernel/puts_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/kernel/puts_tags.txt 2011-02-01 01:42:31 UTC (rev 5217) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/kernel/puts_tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -1 +0,0 @@ -fails:Kernel#puts calls to_s before writing non-string objects Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/module/class_variable_set_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/module/class_variable_set_tags.txt 2011-02-01 01:42:31 UTC (rev 5217) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/module/class_variable_set_tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -1 +0,0 @@ -fails:Module#class_variable_set raises a RuntimeError when self is frozen Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/module/method_defined_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/module/method_defined_tags.txt 2011-02-01 01:42:31 UTC (rev 5217) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/module/method_defined_tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -1,2 +1 @@ -fails:Module#method_defined? returns true if a public or private method with the given name is defined in self, self's ancestors or one of self's included modules fails:Module#method_defined? does not search Object or Kernel when called on a module Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/module/public_method_defined_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/module/public_method_defined_tags.txt 2011-02-01 01:42:31 UTC (rev 5217) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/module/public_method_defined_tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -1,3 +0,0 @@ -fails:Module#public_method_defined? returns true if the named public method is defined by module or its ancestors -fails:Module#public_method_defined? accepts symbols for the method name -fails:Module#public_method_defined? accepts any object that is a String type Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/objectspace/each_object_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/objectspace/each_object_tags.txt 2011-02-01 01:42:31 UTC (rev 5217) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/objectspace/each_object_tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -0,0 +1 @@ +ObjectSpace.each_object returns an enumerator if not given a block Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/string/encoding_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/encoding_tags.txt 2011-02-01 01:42:31 UTC (rev 5217) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/encoding_tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -14,4 +14,3 @@ fails:String#encoding for Strings with \x escapes is not affected by the default internal encoding fails:String#encoding for Strings with \x escapes is not affected by the default external encoding fails:String#encoding for Strings with \x escapes is not affected by both the default internal and external encoding being set at the same time -fails:String#encoding for Strings with \x escapes returns the given encoding if #force_encoding has been called Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/string/initialize_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/initialize_tags.txt 2011-02-01 01:42:31 UTC (rev 5217) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/initialize_tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -1 +0,0 @@ -fails:String#initialize raises a RuntimeError on a frozen instance that would not be modified Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/string/ord_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/ord_tags.txt 2011-02-01 01:42:31 UTC (rev 5217) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/ord_tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -1 +0,0 @@ -fails:String#ord is equivalent to #codepoints.first Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/string/setbyte_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/setbyte_tags.txt 2011-02-01 01:42:31 UTC (rev 5217) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/setbyte_tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -1 +0,0 @@ -fails:String#setbyte can invalidate a String's encoding Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/string/unpack_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/unpack_tags.txt 2011-02-01 01:42:31 UTC (rev 5217) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/unpack_tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -1,3 +1,2 @@ -fails:String#unpack with 'Q' and 'q' directives pads nil when the string is short fails:String#unpack with 'M' directive decodes the rest of the string as MIMEs quoted-printable fails:String#unpack with 'm' directive returns an array by decoding self according to the format string Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/threadgroup/add_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/threadgroup/add_tags.txt 2011-02-01 01:42:31 UTC (rev 5217) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/threadgroup/add_tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -1 +1,2 @@ +fails:ThreadGroup#add removes itself from any other threadgroup fails:ThreadGroup#add adds the given thread to a group and returns self Modified: MacRuby/trunk/spec/frozen/tags/macruby/language/next_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/language/next_tags.txt 2011-02-01 01:42:31 UTC (rev 5217) +++ MacRuby/trunk/spec/frozen/tags/macruby/language/next_tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -1,20 +1,6 @@ -fails:The next statement from within the block causes ensure blocks to run fails:The next statement from within the block skips following code outside an exception block fails:The next statement in a while loop causes nested ensure blocks to run fails:The next statement in a while loop causes ensure blocks to run when mixed with break -fails:The next statement in a while loop when not passed an argument causes ensure blocks to run -fails:The next statement in a while loop when not passed an argument causes ensure blocks to run when nested in an block -fails:The next statement in a while loop when passed an argument causes ensure blocks to run -fails:The next statement in a while loop when passed an argument causes ensure blocks to run when nested in an block fails:The next statement in an until loop causes nested ensure blocks to run fails:The next statement in an until loop causes ensure blocks to run when mixed with break -fails:The next statement in an until loop when not passed an argument causes ensure blocks to run -fails:The next statement in an until loop when not passed an argument causes ensure blocks to run when nested in an block -fails:The next statement in an until loop when passed an argument causes ensure blocks to run -fails:The next statement in an until loop when passed an argument causes ensure blocks to run when nested in an block -fails:The next statement in a loop causes nested ensure blocks to run fails:The next statement in a loop causes ensure blocks to run when mixed with break -fails:The next statement in a loop when not passed an argument causes ensure blocks to run -fails:The next statement in a loop when not passed an argument causes ensure blocks to run when nested in an block -fails:The next statement in a loop when passed an argument causes ensure blocks to run -fails:The next statement in a loop when passed an argument causes ensure blocks to run when nested in an block Modified: MacRuby/trunk/spec/frozen/tags/macruby/language/predefined_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/language/predefined_tags.txt 2011-02-01 01:42:31 UTC (rev 5217) +++ MacRuby/trunk/spec/frozen/tags/macruby/language/predefined_tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -1,11 +1,3 @@ fails:Predefined global $_ is set to the last line read by e.g. StringIO#gets fails:Predefined global $_ is set at the method-scoped level rather than block-scoped fails:Execution variable $: does not include the current directory -fails:Global variable $FILENAME is read-only -fails:Processing RUBYOPT adds the -I path to $LOAD_PATH -fails:Processing RUBYOPT sets $DEBUG to true for '-d' -fails:Processing RUBYOPT sets $VERBOSE to true for '-w' -fails:Processing RUBYOPT sets $VERBOSE to true for '-W' -fails:Processing RUBYOPT sets $VERBOSE to nil for '-W0' -fails:Processing RUBYOPT sets $VERBOSE to false for '-W1' -fails:Processing RUBYOPT sets $VERBOSE to true for '-W2' Modified: MacRuby/trunk/spec/frozen/tags/macruby/library/erb/util/u_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/erb/util/u_tags.txt 2011-02-01 01:42:31 UTC (rev 5217) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/erb/util/u_tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -1,5 +1,5 @@ +fails:ERB::Util.u encode characters fails:ERB::Util.u encode unicode string -fails:ERB::Util.u encode characters fails:ERB::Util.u returns empty string when argument is nil fails:ERB::Util.u returns string when argument is number fails:ERB::Util.u returns string when argument is boolean Modified: MacRuby/trunk/spec/frozen/tags/macruby/library/socket/basicsocket/getsockname_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/socket/basicsocket/getsockname_tags.txt 2011-02-01 01:42:31 UTC (rev 5217) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/socket/basicsocket/getsockname_tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -1 +0,0 @@ -fails:Socket::BasicSocket#getsockname works on sockets listening in ipaddr_any Modified: MacRuby/trunk/spec/frozen/tags/macruby/library/socket/socket/connect_nonblock_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/socket/socket/connect_nonblock_tags.txt 2011-02-01 01:42:31 UTC (rev 5217) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/socket/socket/connect_nonblock_tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -1,2 +1,2 @@ -fails:Socket#connect_nonblock connects the socket to the remote side -fails:Socket#connect_nonblock takes an encoded socket address and starts the connection to it +critical:Socket#connect_nonblock connects the socket to the remote side +critical:Socket#connect_nonblock takes an encoded socket address and starts the connection to it Modified: MacRuby/trunk/spec/frozen/tags/macruby/library/socket/socket/getnameinfo_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/socket/socket/getnameinfo_tags.txt 2011-02-01 01:42:31 UTC (rev 5217) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/socket/socket/getnameinfo_tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -1,2 +0,0 @@ -fails:Socket.getnameinfo gets the name information and resolve the host -fails:Socket.getnameinfo gets the name information and resolves the service Modified: MacRuby/trunk/spec/frozen/tags/macruby/library/stringio/puts_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/stringio/puts_tags.txt 2011-02-01 01:42:31 UTC (rev 5217) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/stringio/puts_tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -1,2 +1 @@ -critical:StringIO#puts when passed [Array, ...] handles self-recursive arrays correctly fails:StringIO#puts when passed 1 or more objects prints a newline when passed an empty string Modified: MacRuby/trunk/spec/frozen/tags/macruby/library/stringscanner/get_byte_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/stringscanner/get_byte_tags.txt 2011-02-01 01:42:31 UTC (rev 5217) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/stringscanner/get_byte_tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -1 +0,0 @@ -fails:StringScanner#get_byte is not multi-byte character sensitive Modified: MacRuby/trunk/spec/frozen/tags/macruby/library/stringscanner/getbyte_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/stringscanner/getbyte_tags.txt 2011-02-01 01:42:31 UTC (rev 5217) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/stringscanner/getbyte_tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -1 +0,0 @@ -fails:StringScanner#getbyte is not multi-byte character sensitive Modified: MacRuby/trunk/spec/frozen/tags/macruby/library/timeout/timeout_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/timeout/timeout_tags.txt 2011-02-01 01:42:31 UTC (rev 5217) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/timeout/timeout_tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -1,3 +1,2 @@ fails:Timeout.timeout raises Timeout::Error when it times out with no specified error type -fails:Timeout.timeout does not wait too long fails:Timeout.timeout does not return too quickly Added: MacRuby/trunk/spec/macruby/tags/macruby/core/objc_tags.txt =================================================================== --- MacRuby/trunk/spec/macruby/tags/macruby/core/objc_tags.txt (rev 0) +++ MacRuby/trunk/spec/macruby/tags/macruby/core/objc_tags.txt 2011-02-02 14:01:33 UTC (rev 5218) @@ -0,0 +1 @@ +fails:-[MacRuby sharedRuntime] can evaluate a given Ruby file using a path or an URL

1 0

[5217] MacRuby/trunk/bin/ruby_deploy
by source_changes＠macosforge.org 01 Feb '11

01 Feb '11

Revision: 5217 http://trac.macosforge.org/projects/ruby/changeset/5217 Author: lsansonetti(a)apple.com Date: 2011-01-31 17:42:31 -0800 (Mon, 31 Jan 2011) Log Message: ----------- add a --gem option to macruby_deploy which will embed the given gem(s) and their dependencies inside the application bundle Modified Paths: -------------- MacRuby/trunk/bin/ruby_deploy Modified: MacRuby/trunk/bin/ruby_deploy =================================================================== --- MacRuby/trunk/bin/ruby_deploy 2011-01-31 23:41:31 UTC (rev 5216) +++ MacRuby/trunk/bin/ruby_deploy 2011-02-01 01:42:31 UTC (rev 5217) @@ -13,6 +13,7 @@ def initialize(argv) @stdlib = [] + @gems = [] OptionParser.new do |opts| opts.banner = "Usage: #{NAME} [options] application-bundle" @@ -20,6 +21,7 @@ opts.on('--embed', 'Embed MacRuby inside the bundle') { @embed = true } opts.on('--no-stdlib', 'Do not embed the standard library') { @no_stdlib = true } opts.on('--stdlib [LIB]', 'Embed only LIB from the standard library') { |lib| @stdlib << lib } + opts.on('--gem [GEM]', 'Embed GEM and its dependencies') { |gem| @gems << gem } opts.on('--verbose', 'Log actions to standard out') { @verbose = true } opts.on('-v', '--version', 'Display the version') do puts RUBY_DESCRIPTION @@ -105,10 +107,33 @@ fix_install_name if File.exist?(app_macruby) end + def gem_deps_libdirs(gem_name) + # Locate gem spec. + require 'rubygems' + gemspecs = Gem.source_index.find_name(gem_name) + if gemspecs.size == 0 + die "Cannot locate gem `#{gem_name}' in #{Gem.path}" + end + gemspec = gemspecs.last + + # Load dependencies libdirs first. + gem_libdirs = [] + gemspec.runtime_dependencies.each do |dep| + gem_libdirs.concat(gem_deps_libdirs(dep.name)) + end + + # Load the gem libdirs. + gem_libdirs.concat(gemspec.require_paths.map { |x| File.join(gemspec.full_gem_path, x) }) + return gem_libdirs + end + STDLIB_PATTERN = "lib/ruby/{,site_ruby/}1.9.*{,/universal-darwin*}" KEEP_STDLIB_PATTERN = "{%s}{,{.,/**/*.}{rb,rbo,bundle}}" def embed + # Prepare the list of gems to embed. + gems_libdirs_to_embed = @gems.map { |x| gem_deps_libdirs(x) }.flatten + # Copy MacRuby.framework inside MyApp.app/Contents/Frameworks. mkdir_p(app_frameworks) rm_rf(app_macruby) @@ -117,7 +142,7 @@ # Delete unnecessary things in the MacRuby.framework copy. dirs = ['bin', 'include', 'lib/libmacruby-static.a', 'share'] dirs << 'lib/ruby' if @no_stdlib - dirs << 'lib/ruby/Gems' # TODO add gems support + dirs << 'lib/ruby/Gems' dirs.each { |x| rm_rf(File.join(app_macruby_usr, x)) } # Only keep specific libs from stdlib. @@ -128,6 +153,15 @@ all.select { |f| keep.grep(/^#{f}/).empty? }.each { |x| rm_rf(x) } end + # Copy the gems libdirs. + unless gems_libdirs_to_embed.empty? + gems_libdirs_dest = File.join(app_macruby_usr, 'lib', 'ruby', 'site_ruby', RUBY_VERSION) + mkdir_p(gems_libdirs_dest) + gems_libdirs_to_embed.each do |libdir| + execute("/usr/bin/ditto #{libdir} #{gems_libdirs_dest}") + end + end + # Only keep the Current version of the MacRuby.framework copy. Dir.glob(File.join(app_macruby, 'Versions/*')).select { |x| base = File.basename(x)

1 0