choctop 0.11.1 → 0.12.0

data/History.txt

@@ -1,9 +1,14 @@
-== 0.11.1 2009-11-17
-
-* New attribute 'source_dir': specify an alternate src folder for the built project (default: build/Release)
-
-== 0.11.0 2009-11-16
-
+== 0.12.0 2010-05-29
+* Tests run again
+* Reorganzied code base so that there is a module ChocTop and a class Configuration
+* New version helper
+  rake version:current
+  rake version:bump:major
+  rake version:bump:minor
+  rake version:bump:patch
+* Pulled in changes from all forks
+
+== 0.11.1
 * ChocTop no longer solely for Cocoa applications
 * Applications shortcut only included if the primary target is a .app bundle
 * Creates a non-versioned symlink to latest released DMG

data/Manifest.txt

@@ -30,6 +30,8 @@ features/support/matchers.rb
 lib/choctop.rb
 lib/choctop/appcast.rb
 lib/choctop/dmg.rb
+lib/choctop/rake_tasks.rb
+lib/choctop/version_helper.rb
 script/console
 script/destroy
 script/generate

data/README.rdoc

@@ -18,12 +18,14 @@ application, creates a DMG package, generates a Sparkle XML file, and posts the
 and XML file to your remote host via rsync.
 
 All rake tasks:
-
-    rake appcast         # Create dmg, update appcast file, and upload to host
-    rake build   # Build Xcode Release
-    rake dmg     # Create the dmg file for appcasting
-    rake feed    # Create/update the appcast file
-    rake upload  # Upload the appcast file to the host
+    rake build               # Build Xcode Release
+    rake dmg                 # Create the dmg file for appcasting
+    rake feed                # Create/update the appcast file
+    rake upload              # Upload the appcast file to the host
+    rake version:bump:major  # Bump the gemspec by a major version.
+    rake version:bump:minor  # Bump the gemspec by a minor version.
+    rake version:bump:patch  # Bump the gemspec by a patch version.
+    rake version:current     # Display the current version
 
 == Why is it called 'ChocTop'? 
 
@@ -89,7 +91,7 @@ Also, in your project's Info.plist, remember to update/add the following keys:
     CFBundleVersion - version for next release, using X.Y.Z format
     SUFeedURL - url to Sparkle URL (future: insert this automatically)
 
-The create the distribution, Sparkle XML file, and upload it to the remote host:
+Then create the distribution, Sparkle XML file, and upload it to the remote host:
 
   rake appcast
 

data/Rakefile

@@ -2,14 +2,13 @@ gem 'hoe', '>= 2.3.2'
 require 'hoe'
 gem 'newgem', '>= 1.5.0'
 require 'newgem'
-require './lib/choctop'
 
 Hoe.plugin :newgem
 
 $hoe = Hoe.spec 'choctop' do
   developer 'Dr Nic Williams', 'drnicwilliams@gmail.com'
   developer 'Chris Bailey', 'chris@cobaltedge.com'
-
+  developer 'Patrick Huesler', 'patrick.huesler@gmail.com'
   extra_deps << ['activesupport']
   extra_deps << ['builder','>= 2.1.2']
   extra_dev_deps << ['newgem', ">= #{::Newgem::VERSION}"]

data/app_generators/install_choctop/templates/Rakefile.erb

@@ -3,7 +3,7 @@ require "rake"
 
 require "choctop"
 
-ChocTop.new do |s|
+ChocTop::Configuration.new do |s|
   # Remote upload target (set host if not same as Info.plist['SUFeedURL'])
   # s.host     = '<%= urlname %>.com'
   s.remote_dir = '/path/to/upload/root/of/app'

data/features/dmg.feature

@@ -14,31 +14,6 @@ Feature: Can build a customised DMG image from application build
     And file ".background/background.jpg" in mounted volume is invisible
     And file ".VolumeIcon.icns" in mounted volume is created
 
-  Scenario: Build a DMG with alternate build folder
-    Given a Cocoa app with choctop installed called "SampleApp"
-    When I invoke task "rake build"
-    And I move "build" to "alternate_build"
-    And I set choctop attribute "source_dir" to "alternate_build/Release"
-    When I invoke task "rake dmg NO_BUILD=1"
-    Then file "appcast/build/SampleApp-0.1.0.dmg" is created
-    When dmg "appcast/build/SampleApp-0.1.0.dmg" is mounted as "SampleApp"
-    Then folder "SampleApp.app" in mounted volume is created
-    And file "Applications" in mounted volume is created
-    And file ".background/background.jpg" in mounted volume is created
-    And file ".background/background.jpg" in mounted volume is invisible
-    And file ".VolumeIcon.icns" in mounted volume is created
-
-  Scenario: Build a DMG with a whitespace name
-    Given a Cocoa app with choctop installed called "App With Whitespace"
-    When I invoke task "rake dmg"
-    Then file "appcast/build/App With Whitespace-1.0.dmg" is created
-    When dmg "appcast/build/App With Whitespace-1.0.dmg" is mounted as "App With Whitespace"
-    Then folder "App With Whitespace.app" in mounted volume is created
-    And file "Applications" in mounted volume is created
-    And file ".background/background.jpg" in mounted volume is created
-    And file ".background/background.jpg" in mounted volume is invisible
-    And file ".VolumeIcon.icns" in mounted volume is created
-
   Scenario: Build a DMG with custom Applications symlink icon
     Given a Cocoa app with choctop installed called "SampleApp"
     And is configured for custom Applications icon

data/features/rake_tasks.feature

@@ -13,19 +13,18 @@ Feature: Rake tasks are available to build and deploy Cocoa apps with Sparkle
     When I invoke task "rake dmg"
     Then file "appcast/build/SampleApp-0.1.0.dmg" is created
 
-  Scenario: rake task to upload the appcast file to the server
+  Scenario: rake task to bump the major version number
     Given a Cocoa app with choctop installed called "SampleApp"
-    And I invoke task "rake dmg feed"
-    And ChocTop config is configured for local rsync
-    When I invoke task "rake upload"
-    Then remote file "my_feed.xml" is created
-    Then remote file "SampleApp-0.1.0.dmg" is created
-    Then remote file "SampleApp.dmg" is created
-    Then remote file "index.php" is created
-    
-  Scenario: change the version number in the Info.plist
+    When I invoke task "rake version:bump:major"
+    Then current xcode project version is "1.0.0"
+
+  Scenario: rake task to bump the minor version number
+    Given a Cocoa app with choctop installed called "SampleApp"
+    When I invoke task "rake version:bump:minor"
+    Then current xcode project version is "0.2.0"
+
+  Scenario: rake task to bump the minor version number
     Given a Cocoa app with choctop installed called "SampleApp"
-    When I invoke task "rake version:set VERSION="1.2.3"" 
-    Then current xcode project version is "1.2.3"
-  
+    When I invoke task "rake version:bump:patch"
+    Then current xcode project version is "0.1.1"
   

data/features/step_definitions/dmg_steps.rb

@@ -12,16 +12,10 @@ Given /^is configured for an asset file "([^\"]*)" to be included in dmg$/ do |f
   choctop_add_file(file)
 end
 
-Given /^I set choctop attribute "([^\"]*)" to "([^\"]*)"$/ do |attribute, value|
-  in_project_folder do
-    append_to_file "Rakefile", "$choctop.#{attribute} = #{value.inspect}"
-  end
-end
-
 When /^dmg "(.*)" is mounted as "(.*)"$/ do |dmg, name|
   @stdout = File.expand_path(File.join(@tmp_root, "hdiutil.out"))
   in_project_folder do
-    @mountpoint = ChocTop.new.mountpoint
+    @mountpoint = ChocTop::Configuration.new.mountpoint
     FileUtils.mkdir_p @mountpoint
     @volume_path = "#{@mountpoint}/#{name}"
     `hdiutil attach '#{dmg}' -mountpoint '#{@volume_path}' -noautoopen > #{@stdout}`

data/features/step_definitions/xcode_steps.rb

@@ -1,5 +1,5 @@
 Then /^current xcode project version is "(.*)"$/ do |version|
   in_project_folder do
-    ChocTop.new.version.to_s.should == version
+    ChocTop::Configuration.new.version.to_s.should == version
   end
 end

data/features/support/env.rb

@@ -1,10 +1,12 @@
-require File.dirname(__FILE__) + "/../../lib/choctop"
+# require File.dirname(__FILE__) + "/../../lib/choctop"
 
 require "rubygems"
 require 'cucumber'
 require 'spec'
 
 require "activesupport"
+$:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'choctop'
 
 Before do
   @tmp_root = File.dirname(__FILE__) + "/../../tmp"

data/lib/choctop.rb

@@ -1,6 +1,3 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
 require "fileutils"
 require "yaml"
 require "builder"
@@ -10,277 +7,286 @@ require "osx/cocoa"
 require "active_support"
 require "RedCloth"
 
-class ChocTop
-  VERSION = '0.11.1'
-  
-  # Path to the Info.plist
-  # Default: "Info.plist"
-  attr_accessor :info_plist_path
-  
-  # The name of the Cocoa application
-  # Default: info_plist['CFBundleExecutable'] or project folder name if "${EXECUTABLE_NAME}"
-  attr_accessor :name
-  
-  # The version of the Cocoa application
-  # Default: info_plist['CFBundleVersion']
-  attr_accessor :version
-  
-  # The target name of the distributed DMG file
-  # Default: #{name}.app
-  attr_accessor :target
-  def target
-    @target ||= File.basename(target_bundle) if target_bundle
-  end
+require 'choctop/appcast'
+require 'choctop/dmg'
+require 'choctop/version_helper'
+require 'choctop/rake_tasks'
 
-  def target_bundle
-    @target_bundle ||= Dir["#{source_dir}/#{name}.*"].first
-  end
+module ChocTop
+  class Configuration
+    include Appcast
+    include Dmg
+    include RakeTasks
+  
+    VERSION = '0.12.0'
+  
+    attr_writer :build_opts
+    def build_opts
+      @build_opts ||= ''
+    end
 
-  # The build type of the distributed DMG file
-  # Default: Release
-  attr_accessor :build_type
+    # Path to the Info.plist
+    # Default: project directory
+    def info_plist_path
+      @info_plist_path ||= File.expand_path(info_plist_name)
+    end
 
-  # The Sparkle feed URL
-  # Default: info_plist['SUFeedURL']
-  attr_accessor :su_feed_url
+    # Name of the Info.plist file
+    # Default: "Info.plist"
+    def info_plist_name
+      @info_plist_name ||= 'Info.plist'
+    end
   
-  # The host name, e.g. some-domain.com
-  # Default: host from base_url
-  attr_accessor :host 
   
-  # The user to log in on the remote server.
-  # Default: empty
-  attr_accessor :user
+    # The name of the Cocoa application
+    # Default: info_plist['CFBundleExecutable'] or project folder name if "${EXECUTABLE_NAME}"
+    attr_accessor :name
   
-  # The url from where the xml + dmg files will be downloaded
-  # Default: dir path from appcast_filename
-  attr_accessor :base_url
+    # The version of the Cocoa application
+    # Default: info_plist['CFBundleVersion']
+    attr_accessor :version
   
-  # The file name for generated release notes for the latest release
-  # Default: release_notes.html
-  attr_accessor :release_notes
+    # The target name of the distributed DMG file
+    # Default: #{name}.app
+    attr_accessor :target
+    def target
+      @target ||= File.basename(target_bundle) if target_bundle
+    end
   
-  # The file name for the project readme file
-  # Default: README.txt
-  attr_accessor :readme
+    # The name of the target in Xcode, such as MacRuby's Compile or
+    # Embed.
+    # Uses the application name by default.
+    attr_accessor :build_target
+    def build_target
+      @build_target ||= name
+    end
   
-  # List of files/bundles to be packaged into the DMG
-  attr_accessor :files
+    def target_bundle
+      @target_bundle ||= Dir["#{build_products}/#{name}.*"].first
+    end
 
-  # The path for an HTML template into which the release_notes.txt are inserted
-  # after conversion to HTML
-  #
-  # The template file is an ERb template, with <%= yield %> as the placeholder
-  # for the generated release notes.
-  #
-  # Currently, any CSS or JavaScript must be inline
-  #
-  # Default: release_notes_template.html.erb, which was generated by install_choctop into each project
-  attr_accessor :release_notes_template
+    # The build type of the distributed DMG file
+    # Default: Release
+    attr_accessor :build_type
 
-  # The name of the local xml file containing the Sparkle item details
-  # Default: info_plist['SUFeedURL'] or linker_appcast.xml
-  attr_accessor :appcast_filename
-  
-  # The remote directory where the xml + dmg files will be rsync'd
-  attr_accessor :remote_dir
-  
-  # The argument flags passed to rsync
-  # Default: -aCv
-  attr_accessor :rsync_args
-  
-  # The base folder to find the built bundle/application
-  # Default: build/Release (rather build/#{build_type})
-  attr_accessor :source_dir
-  def source_dir
-    @source_dir ||= "build/#{build_type}"
-  end
+    # The Sparkle feed URL
+    # Default: info_plist['SUFeedURL']
+    attr_writer :su_feed_url
+    def su_feed_url
+      @su_feed_url ||= info_plist['SUFeedURL']
+    end
   
-  # Folder from where all files will be copied into the DMG
-  # Files are copied here if specified with +add_file+ before DMG creation
-  attr_accessor :dmg_pkg_folder
-  def dmg_pkg_folder
-    @dmg_pkg_folder ||= "#{source_dir}/dmg"
-  end
+    # The host name, e.g. some-domain.com
+    # Default: host from base_url
+    attr_accessor :host 
+  
+    # The user to log in on the remote server.
+    # Default: empty
+    attr_accessor :user
+  
+    # The url from where the xml + dmg files will be downloaded
+    # Default: dir path from appcast_filename
+    attr_writer :base_url
+    def base_url
+      if su_feed_url
+        @base_url ||= File.dirname(su_feed_url)
+      else
+        @base_url
+      end
+    end
   
-  # Generated filename for a distribution, from name, version and .dmg
-  # e.g. MyApp-1.0.0.dmg
-  def pkg_name
-    version ? "#{name}-#{version}.dmg" : versionless_pkg_name
-  end
+    # The file name for generated release notes for the latest release
+    # Default: release_notes.html
+    attr_accessor :release_notes
   
-  # Version-less generated filename for a distribution, from name and .dmg
-  # e.g. MyApp.dmg
-  def versionless_pkg_name
-    "#{name}.dmg"
-  end
+    # The file name for the project readme file
+    # Default: README.txt
+    attr_accessor :readme
   
-  # Path to generated package DMG
-  def pkg
-    "#{build_path}/#{pkg_name}"
-  end
+    # List of files/bundles to be packaged into the DMG
+    attr_accessor :files
+
+    # The path for an HTML template into which the release_notes.txt are inserted
+    # after conversion to HTML
+    #
+    # The template file is an ERb template, with <%= yield %> as the placeholder
+    # for the generated release notes.
+    #
+    # Currently, any CSS or JavaScript must be inline
+    #
+    # Default: release_notes_template.html.erb, which was generated by install_choctop into each project
+    attr_accessor :release_notes_template
+
+    # The name of the local xml file containing the Sparkle item details
+    # Default: info_plist['SUFeedURL'] or linker_appcast.xml
+    attr_writer :appcast_filename
+    def appcast_filename
+      @appcast_filename ||= su_feed_url ? File.basename(su_feed_url) : 'my_feed.xml'
+    end  
+  
+    # The remote directory where the xml + dmg files will be uploaded
+    attr_accessor :remote_dir
+  
+    # Defines the transport to use for upload, default is :rsync, :scp is also available
+    attr_accessor :transport
+    def transport
+      @transport ||= :rsync # other option is scp
+    end
   
-  # Path to built DMG, sparkle's xml file and other assets to be uploaded to remote server
-  def build_path
-    "appcast/build"
-  end
+    # The argument flags passed to rsync
+    # Default: -aCv
+    attr_accessor :rsync_args
   
-  def mountpoint
-    # @mountpoint ||= "/tmp/build/mountpoint#{rand(10000000)}"
-    @mountpoint ||= "/Volumes"
-  end
+    # Additional arguments to pass to scp
+    # e.g. -P 11222
+    attr_accessor :scp_args
+
+    attr_accessor :build_products
+    def build_products
+      @build_products ||= "build/#{build_type}"
+    end
   
-  # Path to Volume when DMG is mounted
-  def volume_path
-    "#{mountpoint}/#{name}"
-  end
+    # Folder from where all files will be copied into the DMG
+    # Files are copied here if specified with +add_file+ before DMG creation
+    attr_accessor :src_folder
+    def src_folder
+      @src_folder ||= "build/#{build_type}/dmg"
+    end
   
-  #
-  # Custom DMG properties
-  #
-  
-  # Path to background .icns image file for custom DMG
-  # Value should be file path relative to root of project
-  # Default: a choctop supplied background image
-  # that matches to default app_icon_position + applications_icon_position
-  # To have no custom background, set value to +nil+
-  attr_accessor :background_file
-  
-  # x, y position of this project's icon on the custom DMG
-  # Default: a useful position for the icon against the default background
-  attr_accessor :app_icon_position
-  
-  # x, y position of the Applications symlink icon on the custom DMG
-  # Default: a useful position for the icon against the default background
-  attr_accessor :applications_icon_position
-  
-  # Path to an .icns file for the DMG's volume icon (looks like a disk or drive)
-  # Default: a DMG icon provided within choctop
-  # To get default, boring blank DMG volume icon, set value to +nil+
-  attr_accessor :volume_icon
-  
-  # Custom icon for the Applications symlink icon
-  # Default: none
-  attr_accessor :applications_icon
-  
-  # Size of icons, in pixels, within custom DMG (between 16 and 128)
-  # Default: 104 - this is nice and big
-  attr_accessor :icon_size
-  
-  # Icon text size
-  # Can pass integer (12) or string ("12" or "12 px")
-  # Default: 12 (px)
-  attr_reader :icon_text_size
-  
-  def icon_text_size=(size)
-    @icon_text_size = size.to_i
-  end
+    # Generated filename for a distribution, from name, version and .dmg
+    # e.g. MyApp-1.0.0.dmg
+    def pkg_name
+      version ? "#{name}-#{version}.dmg" : versionless_pkg_name
+    end
   
-  # The url for the remote package, without the protocol + host
-  # e.g. if absolute url is http://mydomain.com/downloads/MyApp-1.0.dmg
-  # then pkg_relative_url is /downloads/MyApp-1.0.dmg
-  def pkg_relative_url
-    _base_url = base_url.gsub(%r{/$}, '')
-    "#{_base_url}/#{pkg_name}".gsub(%r{^.*#{host}}, '')
-  end
+    # Version-less generated filename for a distribution, from name and .dmg
+    # e.g. MyApp.dmg
+    def versionless_pkg_name
+      "#{name}.dmg"
+    end
   
-  def info_plist
-    @info_plist ||= OSX::NSDictionary.dictionaryWithContentsOfFile(File.expand_path(info_plist_path)) || {}
-  end
+    # Path to generated package DMG
+    def pkg
+      "#{build_path}/#{pkg_name}"
+    end
   
-  # Add an explicit file/bundle/folder into the DMG
-  # Examples:
-  #   file 'build/Release/SampleApp.app', :position => [50, 100]
-  #   file :target_bundle, :position => [50, 100]
-  #   file proc { 'README.txt' }, :position => [50, 100]
-  #   file :position => [50, 100] { 'README.txt' }
-  # Required option:
-  #  +:position+ - two item array [x, y] window position
-  def file(*args, &block)
-    path_or_helper, options = args.first.is_a?(Hash) ? [block, args.first] : [args.first, args.last]
-    throw "add_files #{path_or_helper}, :position => [x,y] option is missing" unless options[:position]
-    self.files ||= {}
-    files[path_or_helper] = options
-  end
-  alias_method :add_file, :file
-
-  def initialize
-    $choctop = $sparkle = self # define a global variable for this object ($sparkle is legacy)
-    
-    yield self if block_given?
-    
-    # Defaults
-    @info_plist_path ||= 'Info.plist'
-    @name ||= info_plist['CFBundleExecutable'] || File.basename(File.expand_path("."))
-    @name = File.basename(File.expand_path(".")) if @name == '${EXECUTABLE_NAME}'
-    @version ||= info_plist['CFBundleVersion']
-    @build_type = ENV['BUILD_TYPE'] || 'Release'
-    
-    if @su_feed_url = info_plist['SUFeedURL']
-      @appcast_filename ||= File.basename(su_feed_url)
-      @base_url ||= File.dirname(su_feed_url)
+    # Path to built DMG, sparkle's xml file and other assets to be uploaded to remote server
+    def build_path
+      "appcast/build"
     end
-    if @base_url
-      @host ||= URI.parse(base_url).host
+  
+    def mountpoint
+      # @mountpoint ||= "/tmp/build/mountpoint#{rand(10000000)}"
+      @mountpoint ||= "/Volumes"
+    end
+  
+    # Path to Volume when DMG is mounted
+    def volume_path
+      "#{mountpoint}/#{name}"
+    end
+  
+    #
+    # Custom DMG properties
+    #
+  
+    # Path to background .icns image file for custom DMG
+    # Value should be file path relative to root of project
+    # Default: a choctop supplied background image
+    # that matches to default app_icon_position + applications_icon_position
+    # To have no custom background, set value to +nil+
+    attr_accessor :background_file
+  
+    # x, y position of this project's icon on the custom DMG
+    # Default: a useful position for the icon against the default background
+    attr_accessor :app_icon_position
+  
+    # x, y position of the Applications symlink icon on the custom DMG
+    # Default: a useful position for the icon against the default background
+    attr_accessor :applications_icon_position
+  
+    # Path to an .icns file for the DMG's volume icon (looks like a disk or drive)
+    # Default: a DMG icon provided within choctop
+    # To get default, boring blank DMG volume icon, set value to +nil+
+    attr_accessor :volume_icon
+  
+    # Custom icon for the Applications symlink icon
+    # Default: none
+    attr_accessor :applications_icon
+  
+    # Size of icons, in pixels, within custom DMG (between 16 and 128)
+    # Default: 104 - this is nice and big
+    attr_accessor :icon_size
+  
+    # Icon text size
+    # Can pass integer (12) or string ("12" or "12 px")
+    # Default: 12 (px)
+    attr_reader :icon_text_size
+  
+    def icon_text_size=(size)
+      @icon_text_size = size.to_i
+    end
+  
+    # The url for the remote package, without the protocol + host
+    # e.g. if absolute url is http://mydomain.com/downloads/MyApp-1.0.dmg
+    # then pkg_relative_url is /downloads/MyApp-1.0.dmg
+    def pkg_relative_url
+      unless base_url
+        raise "The base url should be set in order to create a sparkle feed. Set the SUFeedURL in your Info.plist."
+      end
+      _base_url = base_url.gsub(%r{/$}, '')
+      "#{_base_url}/#{pkg_name}".gsub(%r{^.*#{host}}, '')
     end
-    @release_notes ||= 'release_notes.html'
-    @readme        ||= 'README.txt'
-    @release_notes_template ||= "release_notes_template.html.erb"
-    @rsync_args ||= '-aCv --progress'
-    
-    @background_file ||= File.dirname(__FILE__) + "/../assets/sky_background.jpg"
-    @app_icon_position ||= [175, 65]
-    @applications_icon_position ||= [347, 270]
-    @volume_icon ||= File.dirname(__FILE__) + "/../assets/DefaultVolumeIcon.icns"
-    @icon_size ||= 104
-    @icon_text_size ||= 12
-
-    add_file :target_bundle, :position => app_icon_position
     
-    define_tasks
-  end
+    def info_plist
+      @info_plist ||= OSX::NSDictionary.dictionaryWithContentsOfFile(info_plist_path) || {}
+    end
   
-  def define_tasks
-    return unless Object.const_defined?("Rake")
+    # Add an explicit file/bundle/folder into the DMG
+    # Examples:
+    #   file 'build/Release/SampleApp.app', :position => [50, 100]
+    #   file :target_bundle, :position => [50, 100]
+    #   file proc { 'README.txt' }, :position => [50, 100]
+    #   file :position => [50, 100] { 'README.txt' }
+    # Required option:
+    #  +:position+ - two item array [x, y] window position
+    def file(*args, &block)
+      path_or_helper, options = args.first.is_a?(Hash) ? [block, args.first] : [args.first, args.last]
+      throw "add_files #{path_or_helper}, :position => [x,y] option is missing" unless options[:position]
+      self.files ||= {}
+      files[path_or_helper] = options
+    end
+    alias_method :add_file, :file
+
+    def initialize
+      $choctop = $sparkle = self # define a global variable for this object ($sparkle is legacy)
     
-    desc "Build Xcode #{build_type}"
-    task :build => "#{source_dir}/#{target}/Contents/Info.plist"
+      yield self if block_given?
     
-    task "#{source_dir}/#{target}/Contents/Info.plist" do
-      make_build
-    end
+      # Defaults
+      @name ||= info_plist['CFBundleExecutable'] || File.basename(File.expand_path("."))
+      @name = File.basename(File.expand_path(".")) if @name == '${EXECUTABLE_NAME}'
+      @version ||= info_plist['CFBundleVersion']
+      @build_type = ENV['BUILD_TYPE'] || 'Release'
     
-    desc "Create the dmg file for appcasting"
-    task :dmg => :build do
-      detach_dmg
-      make_dmg
-      detach_dmg
-      convert_dmg_readonly
-      add_eula
-    end
+      if base_url
+        @host ||= URI.parse(base_url).host
+      end
     
-    desc "Create/update the appcast file"
-    task :feed do
-      make_appcast
-      make_dmg_symlink
-      make_index_redirect
-      make_release_notes
-    end
+      @release_notes ||= 'release_notes.html'
+      @readme        ||= 'README.txt'
+      @release_notes_template ||= "release_notes_template.html.erb"
+      @rsync_args ||= '-aCv --progress'
     
-    desc "Upload the appcast file to the host"
-    task :upload => :feed do
-      upload_appcast
-    end
+      @background_file ||= File.dirname(__FILE__) + "/../assets/sky_background.jpg"
+      @app_icon_position ||= [175, 65]
+      @applications_icon_position ||= [347, 270]
+      @volume_icon ||= File.dirname(__FILE__) + "/../assets/DefaultVolumeIcon.icns"
+      @icon_size ||= 104
+      @icon_text_size ||= 12
 
-    task :detach_dmg do
-      detach_dmg
-    end
+      add_file :target_bundle, :position => app_icon_position
     
-    task :size do
-      puts configure_dmg_window
+      define_tasks
     end
   end
-end
-require "choctop/appcast"
-require "choctop/dmg"
-
+end