August 2008 - macruby-changes - lists.macosforge.org

[539] MacRuby/trunk
by source_changes＠macosforge.org 31 Aug '08

31 Aug '08

Revision: 539 http://trac.macosforge.org/projects/ruby/changeset/539 Author: lsansonetti(a)apple.com Date: 2008-08-30 22:21:23 -0700 (Sat, 30 Aug 2008) Log Message: ----------- improved log facility by printing the file/line and optionally into a file Modified Paths: -------------- MacRuby/trunk/debug.h MacRuby/trunk/eval.c Modified: MacRuby/trunk/debug.h =================================================================== --- MacRuby/trunk/debug.h 2008-08-31 04:29:45 UTC (rev 538) +++ MacRuby/trunk/debug.h 2008-08-31 05:21:23 UTC (rev 539) @@ -31,12 +31,15 @@ #if ENABLE_DEBUG_LOGGING # include "vm_core.h" +# include <libgen.h> extern bool ruby_dlog_enabled; -# define DLOG(mod, fmt, args...) \ - if (UNLIKELY(ruby_dlog_enabled)) { \ - printf("%10s ", mod); \ - printf(fmt, ##args); \ - printf("\n"); \ +extern FILE *ruby_dlog_file; +# define DLOG(mod, fmt, args...) \ + if (UNLIKELY(ruby_dlog_enabled)) { \ + fprintf(ruby_dlog_file, "%s:%d %s ", \ + basename((char *)rb_sourcefile()), rb_sourceline(), mod); \ + fprintf(ruby_dlog_file, fmt, ##args); \ + fprintf(ruby_dlog_file, "\n"); \ } #else # define DLOG(mod, fmt, args...) Modified: MacRuby/trunk/eval.c =================================================================== --- MacRuby/trunk/eval.c 2008-08-31 04:29:45 UTC (rev 538) +++ MacRuby/trunk/eval.c 2008-08-31 05:21:23 UTC (rev 539) @@ -56,6 +56,7 @@ #if WITH_OBJC bool ruby_dlog_enabled = false; +FILE *ruby_dlog_file = NULL; #endif void @@ -75,8 +76,22 @@ #endif #if WITH_OBJC - char *s = getenv("MACRUBY_DEBUG"); + char *s; + + s = getenv("MACRUBY_DEBUG"); ruby_dlog_enabled = !(s == NULL || *s == '0'); + s = getenv("MACRUBY_DEBUG_FILE"); + if (s == NULL) { + ruby_dlog_file = stderr; + } + else { + ruby_dlog_file = fopen(s, "w"); + if (ruby_dlog_file == NULL) { + fprintf(stderr, "cannot open macruby debug file `%s'", + strerror(errno)); + ruby_dlog_file = stderr; + } + } #endif Init_stack((void *)&state);

1 0

[538] MacRuby/trunk/Rakefile
by source_changes＠macosforge.org 31 Aug '08

31 Aug '08

Revision: 538 http://trac.macosforge.org/projects/ruby/changeset/538 Author: lsansonetti(a)apple.com Date: 2008-08-30 21:29:45 -0700 (Sat, 30 Aug 2008) Log Message: ----------- fixed ruby platform Modified Paths: -------------- MacRuby/trunk/Rakefile Modified: MacRuby/trunk/Rakefile =================================================================== --- MacRuby/trunk/Rakefile 2008-08-31 03:07:46 UTC (rev 537) +++ MacRuby/trunk/Rakefile 2008-08-31 04:29:45 UTC (rev 538) @@ -31,7 +31,7 @@ NEW_RUBY_VERSION = version_h.scan(/#\s*define\s+RUBY_VERSION\s+\"([^"]+)\"/)[0][0] MACRUBY_VERSION = version_h.scan(/#\s*define\s+MACRUBY_VERSION\s+(.*)/)[0][0] -NEW_RUBY_PLATFORM = 'universal-darwin' + `uname -r`.scan(/^\d+.\d+/)[0] +NEW_RUBY_PLATFORM = 'universal-darwin' + `uname -r`.scan(/^(\d+)\.\d+\.(\d+)/)[0].join('.') FRAMEWORK_PATH = File.join(FRAMEWORK_INSTDIR, FRAMEWORK_NAME + '.framework') FRAMEWORK_VERSION = File.join(FRAMEWORK_PATH, 'Versions', MACRUBY_VERSION)

1 0

[537] MacRuby/trunk/sample-macruby
by source_changes＠macosforge.org 31 Aug '08

31 Aug '08

Revision: 537 http://trac.macosforge.org/projects/ruby/changeset/537 Author: lsansonetti(a)apple.com Date: 2008-08-30 20:07:46 -0700 (Sat, 30 Aug 2008) Log Message: ----------- do not use ib_outlet anymore because it's deprecated Modified Paths: -------------- MacRuby/trunk/sample-macruby/ABPresence/PeopleDataSource.rb MacRuby/trunk/sample-macruby/ABPresence/ServiceWatcher.rb MacRuby/trunk/sample-macruby/AnimatingViews/SimpleLayoutView.rb MacRuby/trunk/sample-macruby/PagePacker/CatalogController.rb MacRuby/trunk/sample-macruby/PagePacker/MyDocument.rb MacRuby/trunk/sample-macruby/PagePacker/PreferenceController.rb MacRuby/trunk/sample-macruby/PathDemo/PathDemoController.rb MacRuby/trunk/sample-macruby/PhotocastViewer/PhotocastViewerController.rb MacRuby/trunk/sample-macruby/ViewModelDemo/Controller.rb MacRuby/trunk/sample-macruby/ViewModelDemo/Superview.rb Modified: MacRuby/trunk/sample-macruby/ABPresence/PeopleDataSource.rb =================================================================== --- MacRuby/trunk/sample-macruby/ABPresence/PeopleDataSource.rb 2008-08-31 02:58:28 UTC (rev 536) +++ MacRuby/trunk/sample-macruby/ABPresence/PeopleDataSource.rb 2008-08-31 03:07:46 UTC (rev 537) @@ -1,6 +1,6 @@ class PeopleDataSource - ib_outlet :table, :serviceWatcher + attr_accessor :table, :serviceWatcher # Initialize and register for AddressBook notifications def awakeFromNib Modified: MacRuby/trunk/sample-macruby/ABPresence/ServiceWatcher.rb =================================================================== --- MacRuby/trunk/sample-macruby/ABPresence/ServiceWatcher.rb 2008-08-31 02:58:28 UTC (rev 536) +++ MacRuby/trunk/sample-macruby/ABPresence/ServiceWatcher.rb 2008-08-31 03:07:46 UTC (rev 537) @@ -1,6 +1,6 @@ class ServiceWatcher - ib_outlet :dataSource + attr_accessor :dataSource def startMonitoring nCenter = IMService.notificationCenter Modified: MacRuby/trunk/sample-macruby/AnimatingViews/SimpleLayoutView.rb =================================================================== --- MacRuby/trunk/sample-macruby/AnimatingViews/SimpleLayoutView.rb 2008-08-31 02:58:28 UTC (rev 536) +++ MacRuby/trunk/sample-macruby/AnimatingViews/SimpleLayoutView.rb 2008-08-31 03:07:46 UTC (rev 537) @@ -1,6 +1,6 @@ class SimpleLayoutView < NSView - ib_outlet :boxColorField + attr_accessor :boxColorField # Default separation between items, and default size of added subviews SEPARATION = 10.0 Modified: MacRuby/trunk/sample-macruby/PagePacker/CatalogController.rb =================================================================== --- MacRuby/trunk/sample-macruby/PagePacker/CatalogController.rb 2008-08-31 02:58:28 UTC (rev 536) +++ MacRuby/trunk/sample-macruby/PagePacker/CatalogController.rb 2008-08-31 03:07:46 UTC (rev 537) @@ -1,5 +1,5 @@ class CatalogController < NSWindowController - ib_outlet :pdfView, :pageSlider, :pageField + attr_accessor :pdfView, :pageSlider, :pageField attr_reader :currentPageIndex Modified: MacRuby/trunk/sample-macruby/PagePacker/MyDocument.rb =================================================================== --- MacRuby/trunk/sample-macruby/PagePacker/MyDocument.rb 2008-08-31 02:58:28 UTC (rev 536) +++ MacRuby/trunk/sample-macruby/PagePacker/MyDocument.rb 2008-08-31 03:07:46 UTC (rev 537) @@ -1,5 +1,5 @@ class MyDocument < NSDocument - ib_outlet :packerView + attr_accessor :packerView def init super Modified: MacRuby/trunk/sample-macruby/PagePacker/PreferenceController.rb =================================================================== --- MacRuby/trunk/sample-macruby/PagePacker/PreferenceController.rb 2008-08-31 02:58:28 UTC (rev 536) +++ MacRuby/trunk/sample-macruby/PagePacker/PreferenceController.rb 2008-08-31 03:07:46 UTC (rev 537) @@ -5,7 +5,7 @@ class PreferenceController < NSWindowController - ib_outlet :paperPopUp, :textFontField + attr_accessor :paperPopUp, :textFontField attr_reader :textFont Modified: MacRuby/trunk/sample-macruby/PathDemo/PathDemoController.rb =================================================================== --- MacRuby/trunk/sample-macruby/PathDemo/PathDemoController.rb 2008-08-31 02:58:28 UTC (rev 536) +++ MacRuby/trunk/sample-macruby/PathDemo/PathDemoController.rb 2008-08-31 03:07:46 UTC (rev 537) @@ -1,6 +1,6 @@ class PathDemoController - ib_outlet :button, :popup, :window, :demoView + attr_accessor :button, :popup, :window, :demoView def awakeFromNib @popup.removeAllItems Modified: MacRuby/trunk/sample-macruby/PhotocastViewer/PhotocastViewerController.rb =================================================================== --- MacRuby/trunk/sample-macruby/PhotocastViewer/PhotocastViewerController.rb 2008-08-31 02:58:28 UTC (rev 536) +++ MacRuby/trunk/sample-macruby/PhotocastViewer/PhotocastViewerController.rb 2008-08-31 03:07:46 UTC (rev 537) @@ -1,6 +1,6 @@ class PhotocastViewerController < NSWindowController - ib_outlet :imageBrowserView + attr_accessor :imageBrowserView def awakeFromNib @cache = [] Modified: MacRuby/trunk/sample-macruby/ViewModelDemo/Controller.rb =================================================================== --- MacRuby/trunk/sample-macruby/ViewModelDemo/Controller.rb 2008-08-31 02:58:28 UTC (rev 536) +++ MacRuby/trunk/sample-macruby/ViewModelDemo/Controller.rb 2008-08-31 03:07:46 UTC (rev 537) @@ -1,6 +1,6 @@ class Controller - ib_outlet :mySuperview, :numberText, :speedText, :numberSlider, :speedSlider + attr_accessor :mySuperview, :numberText, :speedText, :numberSlider, :speedSlider def init super Modified: MacRuby/trunk/sample-macruby/ViewModelDemo/Superview.rb =================================================================== --- MacRuby/trunk/sample-macruby/ViewModelDemo/Superview.rb 2008-08-31 02:58:28 UTC (rev 536) +++ MacRuby/trunk/sample-macruby/ViewModelDemo/Superview.rb 2008-08-31 03:07:46 UTC (rev 537) @@ -1,10 +1,8 @@ class MySuperview < NSView - ib_outlet :controller, :shadowSwitch, :moveToTopSwitch + attr_accessor :controller, :shadowSwitch, :moveToTopSwitch - attr_reader :shadowSwitch, :moveToTopSwitch - def initWithFrame(frame) super return self

1 0

[536] MacRuby/trunk
by source_changes＠macosforge.org 31 Aug '08

31 Aug '08

Revision: 536 http://trac.macosforge.org/projects/ruby/changeset/536 Author: lsansonetti(a)apple.com Date: 2008-08-30 19:58:28 -0700 (Sat, 30 Aug 2008) Log Message: ----------- set Symbol as a constant of Object, to make sure it can be re-opened. This fixes yaml serialization of Symbol objects. Modified Paths: -------------- MacRuby/trunk/class.c MacRuby/trunk/string.c Modified: MacRuby/trunk/class.c =================================================================== --- MacRuby/trunk/class.c 2008-08-31 02:10:23 UTC (rev 535) +++ MacRuby/trunk/class.c 2008-08-31 02:58:28 UTC (rev 536) @@ -153,8 +153,9 @@ rb_define_object_special_methods(klass); } - if (name != NULL && rb_class_tbl != NULL) + if (name != NULL && rb_class_tbl != NULL) { st_insert(rb_class_tbl, (st_data_t)rb_intern(name), (st_data_t)klass); + } return klass; } @@ -162,8 +163,7 @@ VALUE rb_class_boot(VALUE super) { - VALUE klass = rb_objc_create_class(NULL, super); - return (VALUE)klass; + return rb_objc_create_class(NULL, super); } void Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2008-08-31 02:10:23 UTC (rev 535) +++ MacRuby/trunk/string.c 2008-08-31 02:58:28 UTC (rev 536) @@ -5389,6 +5389,8 @@ /* rb_cSymbol is defined in parse.y because it's needed early */ rb_set_class_path(rb_cSymbol, rb_cObject, "Symbol"); + rb_const_set(rb_cObject, rb_intern("Symbol"), rb_cSymbol); + rb_undef_alloc_func(rb_cSymbol); rb_undef_method(CLASS_OF(rb_cSymbol), "new"); rb_define_singleton_method(rb_cSymbol, "all_symbols", rb_sym_all_symbols, 0); /* in parse.y */

1 0

[535] MacRuby/trunk/vm_method.c
by source_changes＠macosforge.org 31 Aug '08

31 Aug '08

Revision: 535 http://trac.macosforge.org/projects/ruby/changeset/535 Author: lsansonetti(a)apple.com Date: 2008-08-30 19:10:23 -0700 (Sat, 30 Aug 2008) Log Message: ----------- implement #remove_method Modified Paths: -------------- MacRuby/trunk/vm_method.c Modified: MacRuby/trunk/vm_method.c =================================================================== --- MacRuby/trunk/vm_method.c 2008-08-30 19:53:28 UTC (rev 534) +++ MacRuby/trunk/vm_method.c 2008-08-31 02:10:23 UTC (rev 535) @@ -372,7 +372,28 @@ rb_warn("removing `%s' may cause serious problem", rb_id2name(mid)); } #if WITH_OBJC - // TODO + SEL sel; + Method m; + + sel = sel_registerName(rb_id2name(mid)); + m = class_getInstanceMethod((Class)klass, sel); + if (m == NULL) { + char buf[100]; + size_t len = strlen((char *)sel); + if (((char *)sel)[len - 1] != ':') { + snprintf(buf, sizeof buf, "%s:", (char *)sel); + sel = sel_registerName(buf); + m = class_getInstanceMethod((Class)klass, sel); + } + } + if (m == NULL) { + rb_name_error(mid, "method `%s' not defined in %s", + rb_id2name(mid), rb_class2name(klass)); + } + if (rb_objc_method_node3(method_getImplementation(m)) == NULL) { + rb_warn("removing pure Objective-C method `%s' may cause serious problem", rb_id2name(mid)); + } + method_setImplementation(m, NULL); #else if (st_lookup(RCLASS_M_TBL(klass), mid, &data)) { body = (NODE *)data; @@ -381,11 +402,11 @@ st_delete(RCLASS_M_TBL(klass), &mid, &data); } } -#endif if (!body) { rb_name_error(mid, "method `%s' not defined in %s", rb_id2name(mid), rb_class2name(klass)); } +#endif if (nd_type(body->nd_body->nd_body) == NODE_CFUNC) { rb_vm_check_redefinition_opt_method(body);

1 0

[534] MacRuby/trunk/vm_method.c
by source_changes＠macosforge.org 30 Aug '08

30 Aug '08

Revision: 534 http://trac.macosforge.org/projects/ruby/changeset/534 Author: lsansonetti(a)apple.com Date: 2008-08-30 12:53:28 -0700 (Sat, 30 Aug 2008) Log Message: ----------- fixed respond_to? to respond to objc methods, also honor the priv argument Modified Paths: -------------- MacRuby/trunk/vm_method.c Modified: MacRuby/trunk/vm_method.c =================================================================== --- MacRuby/trunk/vm_method.c 2008-08-30 18:00:25 UTC (rev 533) +++ MacRuby/trunk/vm_method.c 2008-08-30 19:53:28 UTC (rev 534) @@ -1182,7 +1182,11 @@ sel_respondTo = sel_registerName("respond_to?:"); if (rb_objc_method_node2(klass, sel_respondTo, NULL) == basic_respond_to) { - rb_objc_method_node(klass, id, &imp, NULL); + NODE *method; + + method = rb_objc_method_node(klass, id, &imp, NULL); + if (method != NULL && priv == 0 && (method->nd_noex & NOEX_PRIVATE)) + return false; return imp != NULL; } #else @@ -1223,9 +1227,13 @@ rb_scan_args(argc, argv, "11", &mid, &priv); id = rb_to_id(mid); +#if WITH_OBJC + return rb_obj_respond_to(obj, id, RTEST(priv)) ? Qtrue : Qfalse; +#else if (rb_method_boundp(CLASS_OF(obj), id, !RTEST(priv))) { return Qtrue; } +#endif return Qfalse; }

1 0

[533] MacRuby/trunk/sample-macruby/HotCocoa/box.rb
by source_changes＠macosforge.org 30 Aug '08

30 Aug '08

Revision: 533 http://trac.macosforge.org/projects/ruby/changeset/533 Author: rich(a)infoether.com Date: 2008-08-30 11:00:25 -0700 (Sat, 30 Aug 2008) Log Message: ----------- remove box Removed Paths: ------------- MacRuby/trunk/sample-macruby/HotCocoa/box.rb Deleted: MacRuby/trunk/sample-macruby/HotCocoa/box.rb =================================================================== --- MacRuby/trunk/sample-macruby/HotCocoa/box.rb 2008-08-30 17:59:54 UTC (rev 532) +++ MacRuby/trunk/sample-macruby/HotCocoa/box.rb 2008-08-30 18:00:25 UTC (rev 533) @@ -1,20 +0,0 @@ -require 'hotcocoa' - -include HotCocoa - -application :name => "Box" do |app| - window :frame => [200, 800, 300, 120], :title => "HotCocoa!" do |win| - - win.did_move do - puts "Window moved to #{win.frame.inspect}!" - end - - win.did_resize do - puts "Window resized to #{win.frame.size.inspect}" - end - - win << box(:title => "I am a in a box!", :frame => [0,10, 300, 110], :auto_resize => [:width, :height]) do |b| - b << image_view(:frame => [10,10,60,60], :file => "rich.jpg") - end - end -end

1 0

[532] MacRuby/trunk/sample-macruby/HotCocoa/README
by source_changes＠macosforge.org 30 Aug '08

30 Aug '08

Revision: 532 http://trac.macosforge.org/projects/ruby/changeset/532 Author: rich(a)infoether.com Date: 2008-08-30 10:59:54 -0700 (Sat, 30 Aug 2008) Log Message: ----------- readme for hotcocoa samples Added Paths: ----------- MacRuby/trunk/sample-macruby/HotCocoa/README Added: MacRuby/trunk/sample-macruby/HotCocoa/README =================================================================== --- MacRuby/trunk/sample-macruby/HotCocoa/README (rev 0) +++ MacRuby/trunk/sample-macruby/HotCocoa/README 2008-08-30 17:59:54 UTC (rev 532) @@ -0,0 +1,45 @@ +This directory contains a few demos of using the HotCocoa library. + +To learn more about HotCocoa see: + + http://www.macruby.org/trac/wiki/HotCocoa + +Part of HotCocoa installs a hotcocoa command which generates a +project directory from a template. + +Usage: + +hotcocoa <directory> + +This will generate your directory structure. The samples in this +directory were generated with this command. The basic HotCocoa +directory structure is: + +./directory/Rakefile #=> used with macrake to buid the app +./directory/config/build.yml #=> build options +./directory/lib/application.rb #=> application template +./directory/lib/menu.rb #=> menus used by the app +./resources/HotCocoa.icns #=> hotcocoa icon + +After generating the structure, cd into that directory and run +macrake to build. + +Demos: + +calculator #=> simple calculator example +demo #=> demo of many hotcocoa wrappers +layout_view #=> demo of using the layout view system + +Building the demos: + +Calculator: +cd calculator +macrake + +Demo +cd demo +macrake + +Layout View +cd layout_view +macrake \ No newline at end of file

1 0

[531] MacRuby/trunk/sample-macruby/HotCocoa
by source_changes＠macosforge.org 30 Aug '08

30 Aug '08

Revision: 531 http://trac.macosforge.org/projects/ruby/changeset/531 Author: rich(a)infoether.com Date: 2008-08-30 10:50:52 -0700 (Sat, 30 Aug 2008) Log Message: ----------- remove final files Removed Paths: ------------- MacRuby/trunk/sample-macruby/HotCocoa/collection_view.rb MacRuby/trunk/sample-macruby/HotCocoa/rich.jpg Deleted: MacRuby/trunk/sample-macruby/HotCocoa/collection_view.rb =================================================================== --- MacRuby/trunk/sample-macruby/HotCocoa/collection_view.rb 2008-08-30 17:48:14 UTC (rev 530) +++ MacRuby/trunk/sample-macruby/HotCocoa/collection_view.rb 2008-08-30 17:50:52 UTC (rev 531) @@ -1,75 +0,0 @@ -require 'hotcocoa' - -include HotCocoa - -class Icon - - ib_outlet :name, :image - - def initialize(name, image) - @name = name - puts "crea of #{object_id} - #{@name}" - @image = image - end - - def image - @image - end - - def name - puts "Name of #{object_id} - #{@name}" - @name - end - -end - -class MyIconView < NSView - - include HotCocoa::Behaviors - - def self.create - view = alloc.initWithFrame([0,0,60,60]) - view.create_subviews - view - end - - attr_reader :icon - - def collection_item=(item) - icon.bind "value", toObject:item, withKeyPath:"representedObject.image", options:nil - icon.bind "toolTip", toObject:item, withKeyPath:"representedObject.name", options:nil - end - - def create_subviews - @icon = image_view :frame => [0,0,60,60] - addSubview(icon) - end - - def hitTest(point) - nil - end - -end -list = (1..5).collect { |i| Icon.new("Rich #{i}", image(:file => "rich.jpg"))} -puts list.inspect -icons = array_controller :for => list , - :avoids_empty_selection => true, - :preserves_selection => false, - :selects_inserted => false, - :rearrange_automatically => true, - :sort_by => {:name => :ascending} - -puts icons.arrangedObjects.first.class - -application :name => "Collection View" do |app| - window :frame => [100, 100, 500, 500], :title => "HotCocoa!" do |win| - win << scroll_view(:layout => {:expand => [:width, :height]}) do |scroll| - cv = collection_view :content => {icons => "arrangedObjects"}, - :selection_indexes => {icons => "selectionIndexes"}, - :item_view => MyIconView.create, - :map_bindings => true - scroll << cv - end - end -end - Deleted: MacRuby/trunk/sample-macruby/HotCocoa/rich.jpg =================================================================== (Binary files differ)

1 0

[530] MacRuby/trunk/lib/hotcocoa/application_builder.rb
by source_changes＠macosforge.org 30 Aug '08

30 Aug '08

Revision: 530 http://trac.macosforge.org/projects/ruby/changeset/530 Author: rich(a)infoether.com Date: 2008-08-30 10:48:14 -0700 (Sat, 30 Aug 2008) Log Message: ----------- add ability to copy files in the resources directory Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/application_builder.rb Modified: MacRuby/trunk/lib/hotcocoa/application_builder.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/application_builder.rb 2008-08-30 17:47:03 UTC (rev 529) +++ MacRuby/trunk/lib/hotcocoa/application_builder.rb 2008-08-30 17:48:14 UTC (rev 530) @@ -6,7 +6,7 @@ ApplicationBundlePackage = "APPL????" - attr_accessor :name, :load_file, :sources, :overwrite, :icon, :version, :info_string, :secure + attr_accessor :name, :load_file, :sources, :overwrite, :icon, :version, :info_string, :secure, :resources def self.build(build_options) build_options.each do |key, value| @@ -16,23 +16,28 @@ require 'yaml' build_options = YAML.load(File.read(build_options[:file])) end - ab = new - ab.secure = (build_options[:secure] == true) - ab.name = build_options[:name] - ab.load_file = build_options[:load] - ab.icon = build_options[:icon] if build_options[:icon] && File.exist?(build_options[:icon]) - ab.version = build_options[:version] || "1.0" - ab.info_string = build_options[:info_string] - ab.overwrite = (build_options.include?(:overwrite) ? build_options[:overwrite] : true) + builder = new + builder.secure = (build_options[:secure] == true) + builder.name = build_options[:name] + builder.load_file = build_options[:load] + builder.icon = build_options[:icon] if build_options[:icon] && File.exist?(build_options[:icon]) + builder.version = build_options[:version] || "1.0" + builder.info_string = build_options[:info_string] + builder.overwrite = (build_options.include?(:overwrite) ? build_options[:overwrite] : true) sources = build_options[:sources] || [] sources.each do |source| - ab << source + builder.add_source_path source end - ab.build + resources = build_options[:resources] || [] + resources.each do |resource| + builder.add_resource_path resource + end + builder.build end def initialize @sources = [] + @resources = [] end def build @@ -40,6 +45,7 @@ build_bundle_structure write_bundle_files copy_sources + copy_resources copy_icon_file if icon end @@ -47,11 +53,17 @@ @overwrite end - def <<(source_file_pattern) + def add_source_path(source_file_pattern) Dir.glob(source_file_pattern).each do |source_file| sources << source_file end end + + def add_resource_path(resource_file_pattern) + Dir.glob(resource_file_pattern).each do |resource_file| + resources << resource_file + end + end def secure? secure @@ -103,8 +115,16 @@ end end + def copy_resources + resources.each do |resource| + destination = File.join(resources_root, resource.split("/")[1..-1].join("/")) + FileUtils.mkdir_p(File.dirname(destination)) unless File.exist?(File.dirname(destination)) + FileUtils.cp_r resource, destination + end + end + def copy_icon_file - FileUtils.cp(icon, icon_file) + FileUtils.cp(icon, icon_file) unless File.exist?(icon_file) end def write_pkg_info_file

1 0