hotcocoa 0.6.0pre → 0.6.0pre2

data/README.markdown

@@ -1,27 +1,27 @@
 # hotcocoa
 
 * [http://github.com/ferrous26/hotcocoa](http://github.com/ferrous26/hotcocoa)
-* [Documentation](http://rdoc.info/github/ferrous26/hotcocoa/master/frames) WIP
+* [Documentation](http://rdoc.info/github/ferrous26/hotcocoa/master/frames)
 
 ## Description
 
 HotCocoa is a thin, idiomatic Ruby layer that sits above Cocoa and
-other frameworks. HotCocoa used to be included in MacRuby but is now
-managed as a separate gem.  This will allow HotCocoa to accept
-contributions and evolve more quickly. To see more information on
-HotCocoa (including tutorial) see
+other frameworks. The goal of the project is to simplify the process of creating
+and configuring Cocoa objects used when building native Mac apps. To get more
+information on HotCocoa (including tutorials) see
 [http://macruby.org](http://macruby.org).
 
 ## Note
 
-This is a fork of HotCocoa that is being kept alive by myself and
-other contributors; most of the work now is going in to documentation
-and regression tests, but we are still adding new mappings, improving
-existing mappings, and adding other features that we feel help meet
-the goals of this project.
+HotCocoa has ambitious goals that are difficult to accomplish with the input of
+only a few people. Feedback is the easiest way to contribute and goes a long way
+to making sure HotCocoa is on the right path to accomplishing those goals.
 
-If you find issues with HotCocoa you can open issues and I (or
-another contributor) will try to fix them.
+There are still some APIs that need documentation, regression tests that need to
+be written, and tutorials to be updated; but new features and improved performance
+will also be coming in the not too distant future. If you find issues with
+HotCocoa, don't hesitate to open tickets on Github (or try to fix it yourself and
+send in the patch :)).
 
 There are a list of
 [gotchas](https://github.com/ferrous26/hotcocoa/wiki/Gotchas) in the
@@ -29,22 +29,33 @@ wiki.
 
 ## Install
 
-* sudo macrake install
+From rubygems:
 
-This fork is only available from source right now.
+    sudo macgem install hotcocoa --pre
 
-Note: If you are on Snow Leopard, you will also need the
+You need to add the `--pre` flag since HotCocoa 0.6 is not officially released yet.
+Or you can clone the repository on Github and install from there:
+
+    git clone git://github.com/ferrous26/hotcocoa
+    cd hotcocoa
+    sudo macrake install
+
+__Note__: If you are on Snow Leopard, you will also need the
 [Bridge Support Preview](http://www.macruby.org/files/BridgeSupport%20Preview%203.zip)
-in order to run this fork of HotCocoa. Read about it on the
+in order to run HotCocoa. Read about it on the
 [MacRuby Blog](http://www.macruby.org/blog/2010/10/08/bridgesupport-preview.html).
 
+__Note 2__: You will also need the Mac OS X developer tools in order
+to build apps. Xcode is not required, but the compiler toolchain is
+needed.
+
 ## Documentation
 
 Documentation is a work in progress; some of the documentation is
-being ported from the MacRuby website where it is still available.
+being ported from the MacRuby website and you can still view it there.
 
-The documentation does not include the mappings right now due to the
-way that mappings are implemented; a YARD plug-in is needed for that.
+The documentation currently does not include the mappings right now due to the
+way that mappings are implemented; a YARD plug-in will be needed for thatv
 
 ## Contributing to HotCocoa
 

data/lib/hotcocoa/application/builder.rb

@@ -9,6 +9,9 @@ module Application
   # This class is responsible for building application bundles, but could
   # theoretically be used to build other bundles, such as frameworks, with
   # only a few changes.
+  #
+  # It is designed to work in conjunction with an {Application::Specification}
+  # object which would provide details on how to build the bundle.
   class Builder
 
     ##
@@ -22,17 +25,20 @@ module Application
       new(spec).build(opts)
     end
 
+    ##
+    # Cached spec.
+    #
     # @return [Application::Specification]
     attr_reader :spec
 
     # @param [Application::Specification]
     def initialize spec
       @spec = case spec
-      when Specification
-        spec
-      when String
-        Specification.load spec
-      end
+              when Specification
+                spec
+              when String
+                Specification.load spec
+              end
     end
 
     # @param [Hash]
@@ -50,10 +56,15 @@ module Application
       deploy if opts[:deploy]
     end
 
+    ##
+    # Run the bundle's binary directly so `STDOUT` and `STDERR` appear in the
+    # terminal.
     def run
       `"./#{executable_file}"`
     end
 
+    ##
+    # Destroy the existing bundle, if it exists.
     def remove_bundle_root
       FileUtils.rm_rf bundle_root if File.exist?(bundle_root)
     end
@@ -62,26 +73,37 @@ module Application
     private
 
     ##
-    # Build arguments list and call to `macruby_deploy`.
+    # Call `macruby_deploy` to lend a helping hand.
     def deploy
       puts `macruby_deploy --embed --gem hotcocoa #{deploy_options} #{bundle_root}`
     end
 
+    ##
+    # Build the options list to pass to `macruby_deploy`.
     def deploy_options
       options = []
       spec.gems.each { |g| options << "--gem #{g}" }
       options << '--bs'        if spec.embed_bs?
       options << '--compile'   if spec.compile?
-      options << '--no-stdlib' unless spec.stdlib # @todo use attribute properly
+      options << '--no-stdlib' unless spec.stdlib
+      if spec.stdlib.respond_to? :each
+        spec.stdlib.each do |lib|
+          options << "--stdlib #{lib}"
+        end
+      end
       options.join(' ')
     end
 
+    ##
+    # Setup the basic directory structure of a bundle.
     def build_bundle_structure
       [bundle_root, contents_root, frameworks_root, macos_root, resources_root].each do |dir|
         Dir.mkdir(dir) unless File.exist?(dir)
       end
     end
 
+    ##
+    # Setup the remaining standard files for the bundle.
     def write_bundle_files
       write_pkg_info_file
       write_info_plist_file
@@ -89,6 +111,8 @@ module Application
       write_ruby_main
     end
 
+    ##
+    # Copy the sources, usually just the ruby source code, into the bundle.
     def copy_sources
       spec.sources.each do |source|
         destination = File.join(resources_root, source)
@@ -97,6 +121,12 @@ module Application
       end
     end
 
+    ##
+    # @todo An example project that uses a `xib`.
+    #
+    # Copy the resources, such as images and data, into the bundle.
+    # Resources can also include interface builder files, which will
+    # be compiled for you.
     def copy_resources
       spec.resources.each do |resource|
         destination = File.join(resources_root, resource.split('/')[1..-1].join('/'))
@@ -111,21 +141,36 @@ module Application
       end
     end
 
+    ##
+    # Compile any CoreData model files and copy them to the bundle.
     def compile_data_models
       spec.data_models.each do |data|
         `/Developer/usr/bin/momc #{data} #{resources_root}/#{File.basename(data, ".xcdatamodel")}.mom`
       end
     end
 
+    ##
+    # Copy the icon file to the bundle.
     def copy_icon_file
       FileUtils.cp spec.icon, icon_file
     end
 
+    ##
+    # Generate the `PkgInfo` file for the bundle. Every bundle needs this
+    # in order identify its type of bundle and signature.
     def write_pkg_info_file
-      File.open(pkg_info_file, 'wb') { |f| f.write "#{spec.type}#{spec.signature}" }
+      File.open(pkg_info_file, 'wb') do |file|
+        file.write "#{spec.type}#{spec.signature}"
+      end
     end
 
-    def write_info_plist_file
+    ##
+    # @todo Development region needs to be configurable in the future. And
+    #       so should the default class. They should still both have defaults.
+    #
+    # Generate and the `Info.plist` for the bundle using fields from the
+    # cached app spec.
+    def info_plist
       # http://developer.apple.com/library/mac/#documentation/General/Reference/InfoPlistKeyReference/Articles/AboutInformationPropertyListFiles.html%23//apple_ref/doc/uid/TP40009254-SW1
       info = {
         CFBundleName:                  spec.name,
@@ -138,14 +183,28 @@ module Application
         CFBundleInfoDictionaryVersion: '6.0',
         NSPrincipalClass:              'NSApplication',
         LSUIElement:                   spec.agent,
-        LSMinimumSystemVersion:        '10.6.7', # should match MacRuby
+        LSMinimumSystemVersion:        '10.6.7', # @todo should match MacRuby
       }
       info[:CFBundleIconFile] = File.basename(spec.icon) if spec.icon_exists?
+      info.merge! spec.plist # should always be done last
+      info.to_plist
+    end
 
-      File.open(info_plist_file, 'w') { |f| f.write info.to_plist }
+    ##
+    # Wirte out the generated info plist for the bundle.
+    def write_info_plist_file
+      File.open(info_plist_file, 'w') do |file|
+        file.write info_plist
+      end
     end
 
-    # @todo something better than puts `gcc`
+    ##
+    # @todo Need a better way of specifying the supported architectures,
+    #       hard coding makes HotCocoa susceptible to the same problem
+    #       as before.
+    #
+    # Create the standard bootstrap binary to launch a MacRuby app and place
+    # it in the bundle.
     def build_executable
       File.open(objective_c_source_file, 'wb') do |f|
         f.write %{
@@ -158,12 +217,14 @@ module Application
         }
       end
       Dir.chdir(macos_root) do
-        puts `gcc main.m -o #{executable_file_name} -arch x86_64 -framework MacRuby -framework Foundation -fobjc-gc-only`
+        puts `#{RbConfig::CONFIG['CC']} main.m -o #{executable_file_name} -arch x86_64 -framework MacRuby -framework Foundation -fobjc-gc-only`
       end
       File.unlink(objective_c_source_file)
     end
 
-    # Borrow rb_main from MacRuby Xcode templates
+    ##
+    # Borrow `rb_main` from MacRuby Xcode templates and use it to load all
+    # the sources in the bundle at boot time.
     def write_ruby_main
       File.open(main_ruby_source_file, 'wb') do |f|
         f.write <<-EOF
@@ -186,50 +247,75 @@ module Application
       end
     end
 
+    ##
+    # Path where to put the bundle.
     def bundle_root
       "#{spec.name}.app"
     end
 
+    ##
+    # Path where to put the `Contents' directory of the bundle.
     def contents_root
       File.join(bundle_root, 'Contents')
     end
 
+    ##
+    # Path where to put the `Frameworks' directory of the bundle.
     def frameworks_root
       File.join(contents_root, 'Frameworks')
     end
 
+    ##
+    # Path where to put the `MacOS' directory of the bundle.
     def macos_root
       File.join(contents_root, 'MacOS')
     end
 
+    ##
+    # Path where to put the `Resources' directory of the bundle.
     def resources_root
       File.join(contents_root, 'Resources')
     end
 
+    ##
+    # Path where to put the `Info.plist' directory of the bundle.
     def info_plist_file
       File.join(contents_root, 'Info.plist')
     end
 
+    ##
+    # Path where to put the icon for the bundle.
     def icon_file
       File.join(resources_root, "#{spec.name}.icns")
     end
 
+    ##
+    # Path where to put the `PkgInfo` file for the bundle.
     def pkg_info_file
       File.join(contents_root, 'PkgInfo')
     end
 
+    ##
+    # Generate the name of the binary. Done by removing whitespace from
+    # the `name` attribute of the cached app spec.
     def executable_file_name
       spec.name.gsub(/\s+/, '')
     end
 
+    ##
+    # Path where to put the binary file for the bundle.
     def executable_file
       File.join(macos_root, executable_file_name)
     end
 
+    ##
+    # Temporary path where the temporary source for bootstrap binary.
     def objective_c_source_file
       File.join(macos_root, 'main.m')
     end
 
+    ##
+    # Path where to put the `rb_main.rb` bootstrap file.
     def main_ruby_source_file
       File.join(resources_root, 'rb_main.rb')
     end

data/lib/hotcocoa/application/specification.rb

@@ -127,7 +127,7 @@ module Application
     # Empty by default.
     #
     # @return [Hash]
-    # attr_accessor :plist
+    attr_accessor :plist
 
     # @todo Support localization related plist keys natively
     # @todo CFBundleDevelopmentRegion (Recommended)
@@ -154,7 +154,7 @@ module Application
     # @return [Array<String>]
     attr_accessor :data_models
 
-    # @group Deloyment Options
+    # @group Deployment Options
 
     ##
     # Whether to include the Ruby stdlib in the app when embedding
@@ -244,8 +244,6 @@ module Application
     alias_method :embed_bs?, :embed_bs
 
     ##
-    # @todo Is this actually useful or can we get rid of it?
-    #
     # Whether or not to always make a clean build of the app.
     #
     # Defaults to false.
@@ -257,7 +255,7 @@ module Application
     # @endgroup
 
     DEFAULT_ATTRIBUTES = {
-      # plist:       {}, # @todo Finish this before release
+      plist:       {},
       sources:     [],
       resources:   [],
       data_models: [],
@@ -281,8 +279,6 @@ module Application
       end
       yield self
 
-      # @todo go through plist and overwrite specific keys?
-
       # @todo should we verify at initialization or defer until building?
       verify!
     end
@@ -342,7 +338,6 @@ module Application
       @copyright = @copyright.to_s if @copyright
     end
 
-    # @todo Should a warning be given if not embedding the stdlib?
     def verify_stdlib
       # need to be careful here; the main components of hotcocoa do
       # not depend on the stdlib right now, but if that changes then

data/lib/hotcocoa/application_builder.rb

@@ -302,7 +302,6 @@ module HotCocoa
       puts `macruby_deploy --embed --gem hotcocoa #{options} #{bundle_root}`
     end
 
-    # @todo something better than puts `gcc`
     def build_executable
       File.open(objective_c_source_file, 'wb') do |f|
         f.write %{
@@ -315,7 +314,7 @@ module HotCocoa
         }
       end
       Dir.chdir(macos_root) do
-        puts `gcc main.m -o #{objective_c_executable_file} -arch x86_64 -framework MacRuby -framework Foundation -fobjc-gc-only`
+        puts `#{RbConfig::CONFIG['CC']} main.m -o #{objective_c_executable_file} -arch x86_64 -framework MacRuby -framework Foundation -fobjc-gc-only`
       end
       File.unlink(objective_c_source_file)
     end

data/lib/hotcocoa/mappings/appkit/tracking_area.rb

@@ -16,8 +16,12 @@ HotCocoa::Mappings.map tracking_area: NSTrackingArea do
   
   def init_with_options tracking_area, options
     rect = options.delete(:rect)
+    widget_options = options.delete(:options)
+    if widget_options.nil?
+      raise ArgumentError.new("Options must be set for NSTrackingArea, in particular the type of tracking area")
+    end
     tracking_area.initWithRect rect,
-                      options: options.delete(:options),
+                      options: widget_options,
                         owner: options.delete(:owner),
                      userInfo: nil
   end

data/lib/hotcocoa/notification_listener.rb

@@ -39,7 +39,7 @@ class HotCocoa::NotificationListener
 
   class << self
     ##
-    # List of all {HotCocoa::NotificationListeners}.
+    # List of all {HotCocoa::NotificationListener}s.
     #
     # @return [HotCocoa::NotificationListener]
     attr_reader :registered_listeners
@@ -66,22 +66,32 @@ class HotCocoa::NotificationListener
   #   notification
   # @yieldparam [String] notification the name of the notification received
   def initialize options = {}, &block
-    raise 'You must pass a block to act as the callback' unless block_given?
+    unless block_given?
+      raise ArgumentError, 'You must pass a block to act as the callback'
+    end
     @callback = block
 
     @name                = options[:named]
     @sender              = options[:sent_by]
     @suspension_behavior = DistributedBehaviors[options[:when_suspended] || :coalesce]
     @distributed         = (options[:distributed] == true)
-    NotificationListener.registered_listeners << self
+    self.class.registered_listeners << self
     observe
   end
 
+  ##
+  # (see #stop_listening)
+  # @deprecated Use {#stop_listening} instead. This API is scheduled to
+  #             be removed in HotCocoa 0.7.
+  def stop_notifications options = {}
+    stop_listening options
+  end
+
   ##
   # Stop the listener from listening to any future notifications. The
   # options available here are the same as the {#initialize} methods
   # `:named` and `:sent_by` options.
-  def stop_notifications options = {}
+  def stop_listening options = {}
     if options.has_key?(:named) || options.has_key?(:sent_by)
       notification_center.removeObserver self,
                                    name: options[:named],
@@ -89,6 +99,7 @@ class HotCocoa::NotificationListener
     else
       notification_center.removeObserver self
     end
+    self.class.registered_listeners.delete self
   end
 
   ##

data/lib/hotcocoa/rake_tasks.rb

@@ -0,0 +1,30 @@
+require 'hotcocoa/application/builder'
+
+builder = Application::Builder.new APPSPEC
+
+desc 'Build the application'
+task :build do
+  builder.build
+end
+
+desc 'Build a deployable version of the application'
+task :deploy do
+  builder.build deploy: true
+end
+
+desc 'Build and execute the application'
+task :run => [:build] do
+  builder.run
+end
+
+desc 'Cleanup build files'
+task :clean do
+  builder.remove_bundle_root
+end
+
+desc 'Create the dmg archive from the application bundle'
+task :dmg => :deploy do
+  app_name = builder.spec.name
+  rm_rf "#{app_name}.dmg"
+  sh "hdiutil create #{app_name}.dmg -quiet -srcdir #{app_name}.app -format UDZO -imagekey zlib-level=9"
+end

data/lib/hotcocoa/standard_rake_tasks.rb

@@ -1,12 +1,16 @@
 $stderr.puts <<EOM
-standard_rake_tasks.rb is deprecated in favour of a new app template
-which declares the tasks directly in the template Rakefile.
+The old build system, which uses standard_rake_tasks.rb is deprecated in favour
+of a more easily configurable build system as of HotCocoa 0.6. The old build
+system will be removed in HotCocoa 0.7.
+
+You can update your existing project by looking at the new project template, which
+can be found on Github:
+
+https://github.com/ferrous26/hotcocoa/blob/master/template
 
-You can update your Rakefile by copying the new tasks from Github at
-https://github.com/ferrous26/hotcocoa/blob/master/template/Rakefile
 EOM
 
-AppConfig = HotCocoa::ApplicationBuilder::Configuration.new( 'config/build.yml' )
+AppConfig = HotCocoa::ApplicationBuilder::Configuration.new('config/build.yml')
 
 desc 'Build a deployable version of the application'
 task :deploy do

data/lib/hotcocoa/version.rb

@@ -1,3 +1,3 @@
 module HotCocoa
-  VERSION = '0.6.0pre'
+  VERSION = '0.6.0pre2'
 end

data/template/Rakefile

@@ -1,33 +1,8 @@
-require 'rubygems'
-require 'hotcocoa/application/builder'
-
-builder = Application::Builder.new '__APPLICATION_NAME__.appspec'
-
-desc 'Build the application'
-task :build do
-  builder.build
-end
+APPSPEC = '__APPLICATION_NAME__.appspec'
 
-desc 'Build a deployable version of the application'
-task :deploy do
-  builder.build deploy: true
-end
-
-desc 'Build and execute the application'
-task :run => [:build] do
-  builder.run
-end
-
-desc 'Cleanup build files'
-task :clean do
-  builder.remove_bundle_root
-end
+require 'rubygems'
+require 'hotcocoa/rake_tasks'
 
-desc 'Create the dmg archive from the application bundle'
-task :dmg => :deploy do
-  app_name = builder.spec.name
-  rm_rf "#{app_name}.dmg"
-  sh "hdiutil create #{app_name}.dmg -quiet -srcdir #{app_name}.app -format UDZO -imagekey zlib-level=9"
-end
+task :default => :run
 
-task :default => [:run]
+# Add your own tasks here

data/template/__APPLICATION_NAME__.appspec

@@ -1,8 +1,42 @@
+# for more information about the fields that can be set on the specification, check out the rdoc:
+#   http://rdoc.info/github/ferrous26/hotcocoa/master/Application/Specification
+#
 Application::Specification.new do |s|
   s.name       = '__APPLICATION_NAME__'
   s.identifier = 'com.__COMPANY_NAME__.__APPLICATION_NAME__'
+
+  # The version of the app, usually including the build number.
   s.version    = '1.0'
+
   s.icon       = 'resources/HotCocoa.icns'
   s.resources  = Dir.glob('resources/**/*.*')
   s.sources    = Dir.glob('lib/**/*.rb')
+
+  # optional copyright
+  # s.copyright = "2011, Your Company"
+
+  # optional short version (in contrast to the full version, the short version should not contain the build number)
+  # s.short_version = "$MAJOR.$MINOR.$PATCHLEVEL"
+
+  # to avoid embedding the standard libs
+  # s.stdlib   = false
+  # alternatively, specify the modules that you wish to include
+  # s.stdlib   = ['base64', 'matrix', 'set']
+
+  # specify which gems you wish to be bundled with your application
+  # hotcocoa is automatically bundled and doesn't need to be specified here
+  # s.gems     = ['rest-client']
+
+  # uncomment if you wish to embed the BridgeSupport files during deployment
+  # useful if you need to deploy the app to OS X 10.6.
+  # s.embed_bs = true
+
+  # uncomment to always make a clean build of the app
+  # s.overwrite = true
+
+  # toggle whether the app is an daemon with UI or a regular app
+  # You can use this flag to hide the dock icon for the app; the
+  # default value is false so that apps will have a dock icon
+  # s.agent    = true
 end
+

data/test/application/helper.rb

@@ -0,0 +1,21 @@
+require 'hotcocoa/application/builder'
+
+class TestApplicationModule < MiniTest::Unit::TestCase
+  include Application
+
+  def hotconsole_spec
+    @@hotconsole_spec ||= Specification.load 'test/fixtures/hotconsole.appspec'
+  end
+  def stopwatch_spec
+    @@stopwatch_spec  ||= Specification.load 'test/fixtures/stopwatch.appspec'
+  end
+
+  def minimal_spec
+    Specification.new do |s|
+      s.name       = 'test'
+      s.identifier = 'com.test.test'
+      yield s if block_given?
+    end
+  end
+
+end

data/test/application/test_builder.rb

@@ -1,28 +1,71 @@
-require 'hotcocoa/application/builder'
+require 'test/application/helper'
 
-class TestApplicationBuilder < MiniTest::Unit::TestCase
-  include Application
+class TestApplicationBuilder < TestApplicationModule
 
-  TEST_DIR = File.join(ENV['TMPDIR'], 'test_app_specification')
+  def hotconsole
+    @@hotconsole ||= Builder.new hotconsole_spec
+  end
+  def stopwatch
+    @@stopwatch  ||= Builder.new stopwatch_spec
+  end
+
+  def test_caches_spec
+    assert_equal stopwatch_spec, stopwatch.spec
+  end
 
-  # Some HotCocoa appspec files, converted from build.yml files borrowed from projects on Github
-  HOTCONSOLE = 'test/fixtures/hotconsole.appspec'
-  STOPWATCH  = 'test/fixtures/stopwatch.appspec'
+  # I don't think it is too important to test deployment as well
+  # as long as we make sure we are passing the correct options
+  # to `macruby_deploy`
 
-  def setup;    FileUtils.mkdir TEST_DIR; end
-  def teardown; FileUtils.rm_rf TEST_DIR; end
+  def test_deploy_option_gems
+    assert_includes stopwatch.send(:deploy_options),  '--gem rest-client'
+    refute_includes hotconsole.send(:deploy_options), '--gem'
+  end
 
-  def test_caches_spec
-    spec = Specification.load STOPWATCH
-    builder = Builder.new spec
-    assert_equal spec, builder.spec
+  def test_deploy_option_compile
+    assert_includes stopwatch.send(:deploy_options),  '--compile'
+    refute_includes hotconsole.send(:deploy_options), '--compile'
+  end
+
+  def test_deploy_option_embed_bs
+    refute_includes stopwatch.send(:deploy_options),  '--bs'
+    assert_includes hotconsole.send(:deploy_options), '--bs'
+  end
+
+  def test_deploy_option_stdlib
+    assert_includes stopwatch.send(:deploy_options),  '--no-stdlib'
+    refute_includes hotconsole.send(:deploy_options), 'stdlib'
+
+    spec = minimal_spec do |s|
+      s.stdlib = ['matrix', 'base64']
+    end
+    options = Builder.new(spec).send :deploy_options
+    refute_includes options, '--no-stdlib'
+    assert_includes options, '--stdlib matrix'
+    assert_includes options, '--stdlib base64'
   end
 
-  def test_deploy_options
-    spec = Specification.load STOPWATCH
-    builder = Builder.new spec
-    options = builder.send :deploy_options
-    assert options.include? "--gem rest-client"
+  def test_plist_only_uses_icon_if_it_can
+    plist = load_plist(hotconsole.send(:info_plist))
+    refute_includes plist, :CFBundleIconFile
+
+    spec = hotconsole_spec.dup
+    spec.icon = '/Applications/Calculator.app/Contents/Resources/Calculator.icns'
+    plist = load_plist(Builder.new(spec).send(:info_plist))
+    assert_includes plist, :CFBundleIconFile
+  end
+
+  def test_plist_hash_from_spec_overrides_all
+    spec = hotconsole_spec.dup
+    spec.plist[:MyKey]            = true
+    spec.plist[:NSPrincipleClass] = 'Foo'
+    spec.plist[:CFBundleName]     = 'Cake'
+
+    plist = load_plist(Builder.new(spec).send(:info_plist))
+    assert_equal true,            plist[:MyKey             ]
+    assert_equal 'Foo',           plist[:NSPrincipleClass  ]
+    assert_equal 'Cake',          plist[:CFBundleName      ]
+    assert_equal spec.identifier, plist[:CFBundleIdentifier]
   end
 
 end

data/test/application/test_specification.rb

@@ -1,11 +1,6 @@
-require 'hotcocoa/application/specification'
+require 'test/application/helper'
 
-class TestApplicationSpecification < MiniTest::Unit::TestCase
-  include Application
-
-  # Some HotCocoa appspec files, converted from build.yml files borrowed from projects on Github
-  HOTCONSOLE = 'test/fixtures/hotconsole.appspec'
-  STOPWATCH  = 'test/fixtures/stopwatch.appspec'
+class TestApplicationSpecification < TestApplicationModule
 
   def rescue_spec_error_for &block
     begin
@@ -15,14 +10,6 @@ class TestApplicationSpecification < MiniTest::Unit::TestCase
     end
   end
 
-  def minimal_spec
-    Specification.new do |s|
-      s.name       = 'test'
-      s.identifier = 'com.test.test'
-      yield s if block_given?
-    end
-  end
-
   def test_spec_requires_a_block
     error = rescue_spec_error_for # no block given
     assert_match /must pass a block/, error.message
@@ -259,7 +246,7 @@ class TestApplicationSpecification < MiniTest::Unit::TestCase
 
   # doubles as an integration test
   def test_load_evaluates_files_properly
-    spec = Application::Specification.load HOTCONSOLE
+    spec = hotconsole_spec
     assert_equal 'HotConsole',                     spec.name
     assert_equal 'com.vincentisambart.HotConsole', spec.identifier
     assert_equal '1.0',                            spec.version
@@ -267,7 +254,7 @@ class TestApplicationSpecification < MiniTest::Unit::TestCase
     assert_equal [],                               spec.resources
     assert_equal 'girb',                           spec.signature
 
-    spec = Application::Specification.load STOPWATCH
+    spec = stopwatch_spec
     assert_equal 'Stopwatch',                         spec.name
     assert_equal 'nz.co.kearse.stopwatch',            spec.identifier
     assert_equal Dir.glob('{lib,hotcocoa}*/**/*.rb'), spec.sources

data/test/mappings/test_bonjour.rb

@@ -76,4 +76,13 @@ class TestBonjourMappings < MiniTest::Unit::TestCase
     skip 'TODO'
   end
 
+  def bench_delegate_building
+    browser = bonjour_browser
+    assert_performance_linear do |n|
+      n.times do
+        browser.did_find_service { |_,_| }
+      end
+    end
+  end
+
 end

data/test/mappings/test_tracking_area.rb

@@ -12,7 +12,7 @@ class TestTrackingAreaMappings < MiniTest::Unit::TestCase
 
   def bench_create_tracking_area
     assert_performance_linear do |n|
-      n.times { HotCocoa.tracking_area }
+      n.times { HotCocoa.tracking_area(options: [:mouse_entered_and_exited, :active_first_responder]) }
     end
   end
 end

data/test/test_application_builder.rb

@@ -6,90 +6,80 @@ require 'hotcocoa/application_builder'
 class TestConfiguration < MiniTest::Unit::TestCase
 
   Configuration = HotCocoa::ApplicationBuilder::Configuration
-  TEST_DIR      = File.join( ENV['TMPDIR'], 'test_app_builder' )
+  TEST_DIR      = File.join(ENV['TMPDIR'], 'test_app_builder')
 
   # Some HotCocoa build.yml files, borrowed from projects on Github
-  HOTCONSOLE = 'test/fixtures/hotconsole.yml'
-  CALCULATOR = 'test/fixtures/calculator.yml'
-  STOPWATCH  = 'test/fixtures/stopwatch.yml'
-  EMPTY_APP  = 'test/fixtures/empty.yml'
+  def hotconsole_config
+    @@hotconsole_config ||= Configuration.new 'test/fixtures/hotconsole.yml'
+  end
+  def calculator_config
+    @@calculator_config ||= Configuration.new 'test/fixtures/calculator.yml'
+  end
+  def stopwatch_config
+    @@stopwatch_config ||= Configuration.new 'test/fixtures/stopwatch.yml'
+  end
+  def empty_config
+    @@empty_config ||= Configuration.new 'test/fixtures/empty.yml'
+  end
 
   def setup;    FileUtils.mkdir TEST_DIR; end
   def teardown; FileUtils.rm_rf TEST_DIR; end
 
   def test_reads_attributes
-    conf = Configuration.new HOTCONSOLE
+    conf = hotconsole_config
     assert_equal 'HotConsole',                conf.name
     assert_equal '1.0',                       conf.version
     assert_equal 'resources/HotConsole.icns', conf.icon
     assert_equal ['resources/**/*.*'],        conf.resources
     assert_equal ['lib/**/*.rb'],             conf.sources
 
-    conf = Configuration.new CALCULATOR
+    conf = calculator_config
     assert_equal 'Calculator', conf.name
     assert_equal '2.0', conf.version
   end
 
   def test_version_defaults_to_1_if_not_set
-    conf = Configuration.new STOPWATCH
+    conf = stopwatch_config
     refute_nil conf.version
     assert_equal '1.0', conf.version
   end
 
   def test_sources_resources_and_data_models_are_initialized_to_an_empty_array_if_not_provided
-    conf = Configuration.new EMPTY_APP
+    conf = empty_config
     assert_empty conf.sources
     assert_empty conf.resources
     assert_empty conf.data_models
   end
 
   def test_overwirte_attribute
-    conf = Configuration.new EMPTY_APP
-    refute conf.overwrite?
-
-    conf = Configuration.new STOPWATCH
-    assert conf.overwrite?
+    refute empty_config.overwrite?
+    assert stopwatch_config.overwrite?
   end
 
   def test_agent_attribute
-    conf = Configuration.new EMPTY_APP
-    assert_equal '0', conf.agent
-
-    conf = Configuration.new STOPWATCH
-    assert_equal '1', conf.agent
+    assert_equal '0', empty_config.agent
+    assert_equal '1', stopwatch_config.agent
   end
 
   def test_stdlib_attribute
-    conf = Configuration.new HOTCONSOLE
-    assert_equal true, conf.stdlib
-
-    conf = Configuration.new STOPWATCH
-    assert_equal false, conf.stdlib
+    assert_equal true, hotconsole_config.stdlib
+    assert_equal false, stopwatch_config.stdlib
   end
 
   def test_type_attribute
-    conf = Configuration.new HOTCONSOLE
-    assert_equal 'APPL', conf.type
-
-    conf = Configuration.new EMPTY_APP
-    assert_equal 'BNDL', conf.type
+    assert_equal 'APPL', hotconsole_config.type
+    assert_equal 'BNDL', empty_config.type
   end
 
   def test_signature_attribute
-    conf = Configuration.new EMPTY_APP
-    assert_equal '????', conf.signature
-
-    conf = Configuration.new HOTCONSOLE
-    assert_equal 'girb', conf.signature
+    assert_equal '????', empty_config.signature
+    assert_equal 'girb', hotconsole_config.signature
   end
 
   def test_icon_exists?
-    conf = Configuration.new HOTCONSOLE
-    refute conf.icon_exists?
-
-    # works because this project uses the icon from a system app
-    conf = Configuration.new CALCULATOR
-    assert conf.icon_exists?
+    refute hotconsole_config.icon_exists?
+    # works on all Macs because this project uses the icon from a system app
+    assert calculator_config.icon_exists?
   end
 
 end

data/test/test_notification_listener.rb

@@ -1,19 +1,48 @@
 # Integration tests
 class TestNotificationListener < MiniTest::Unit::TestCase
+  include HotCocoa
 
-  def test_
+  def teardown
+    NotificationListener.registered_listeners.each &:stop_listening
   end
 
-  def test_
+  def test_requires_a_block
+    assert_raises ArgumentError do
+      NotificationListener.new
+    end
   end
 
-  def test_
+  def test_caches_listeners
+    listener = NotificationListener.new { |_| }
+    assert_includes NotificationListener.registered_listeners, listener
   end
 
-  def test_
+  def test_executes_block_when_notif_is_received
+    got_callback = false
+    NotificationListener.new named: 'test' do |_|
+      got_callback = true
+    end
+    NSNotificationCenter.defaultCenter.postNotificationName 'test',
+                                                    object: self
+    assert got_callback
   end
 
-  def test_
+  def test_can_stop_listening
+    got_callback = false
+    listener = NotificationListener.new named: 'test2' do |_|
+      got_callback = true
+    end
+    listener.stop_listening
+    NSNotificationCenter.defaultCenter.postNotificationName 'test2',
+                                                    object: self
+
+    refute_includes NotificationListener.registered_listeners, listener
+    refute got_callback
+  end
+
+  def test_on_notification_is_alias
+    listener = ::HotCocoa.on_notification { |_| }
+    assert_kind_of NotificationListener, listener
   end
 
 end

metadata

@@ -2,7 +2,7 @@
 name: hotcocoa
 version: !ruby/object:Gem::Version
   prerelease: 5
-  version: 0.6.0pre
+  version: 0.6.0pre2
 platform: ruby
 authors:
 - Richard Kilmer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-04 00:00:00 -04:00
+date: 2011-10-08 00:00:00 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -168,6 +168,7 @@ files:
 - lib/hotcocoa/mappings.rb
 - lib/hotcocoa/mvc.rb
 - lib/hotcocoa/notification_listener.rb
+- lib/hotcocoa/rake_tasks.rb
 - lib/hotcocoa/standard_rake_tasks.rb
 - lib/hotcocoa/target_action_convenience.rb
 - lib/hotcocoa/template.rb
@@ -178,6 +179,7 @@ files:
 - template/lib/menu.rb
 - template/Rakefile
 - template/resources/HotCocoa.icns
+- test/application/helper.rb
 - test/application/test_builder.rb
 - test/application/test_specification.rb
 - test/core_extensions/test_kernel.rb
@@ -237,6 +239,7 @@ signing_key:
 specification_version: 3
 summary: Cocoa mapping library for MacRuby
 test_files:
+- test/application/helper.rb
 - test/application/test_builder.rb
 - test/application/test_specification.rb
 - test/core_extensions/test_kernel.rb