choctop 0.11.0 → 0.11.1

data/History.txt

@@ -1,3 +1,8 @@
+== 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
 
 * ChocTop no longer solely for Cocoa applications
 * Applications shortcut only included if the primary target is a .app bundle

data/features/dmg.feature

@@ -14,6 +14,20 @@ 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"

data/features/step_definitions/dmg_steps.rb

@@ -12,6 +12,12 @@ 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

data/lib/choctop.rb

@@ -11,7 +11,7 @@ require "active_support"
 require "RedCloth"
 
 class ChocTop
-  VERSION = '0.11.0'
+  VERSION = '0.11.1'
   
   # Path to the Info.plist
   # Default: "Info.plist"
@@ -33,7 +33,7 @@ class ChocTop
   end
 
   def target_bundle
-    @target_bundle ||= Dir["build/#{build_type}/#{name}.*"].first
+    @target_bundle ||= Dir["#{source_dir}/#{name}.*"].first
   end
 
   # The build type of the distributed DMG file
@@ -89,11 +89,18 @@ class ChocTop
   # 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
+  
   # 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"
+  attr_accessor :dmg_pkg_folder
+  def dmg_pkg_folder
+    @dmg_pkg_folder ||= "#{source_dir}/dmg"
   end
   
   # Generated filename for a distribution, from name, version and .dmg
@@ -237,9 +244,9 @@ class ChocTop
     return unless Object.const_defined?("Rake")
     
     desc "Build Xcode #{build_type}"
-    task :build => "build/#{build_type}/#{target}/Contents/Info.plist"
+    task :build => "#{source_dir}/#{target}/Contents/Info.plist"
     
-    task "build/#{build_type}/#{target}/Contents/Info.plist" do
+    task "#{source_dir}/#{target}/Contents/Info.plist" do
       make_build
     end
     

data/lib/choctop/dmg.rb

@@ -16,9 +16,9 @@ module ChocTop::Dmg
   end
   
   def copy_files
-    FileUtils.mkdir_p(src_folder)
+    FileUtils.mkdir_p(dmg_pkg_folder)
     files.each do |path, options|
-      FileUtils.cp_r(path, src_folder)
+      FileUtils.cp_r(path, dmg_pkg_folder)
     end
   end
   
@@ -27,7 +27,7 @@ module ChocTop::Dmg
     copy_files
     FileUtils.mkdir_p build_path
     FileUtils.mkdir_p mountpoint # TODO can we remove random mountpoints?
-    sh "hdiutil create -format UDRW -quiet -volname '#{name}' -srcfolder '#{src_folder}' '#{pkg}'"
+    sh "hdiutil create -format UDRW -quiet -volname '#{name}' -srcfolder '#{dmg_pkg_folder}' '#{pkg}'"
     sh "hdiutil attach '#{pkg}' -mountpoint '#{volume_path}' -noautoopen -quiet"
     sh "bless --folder '#{volume_path}' --openfolder '#{volume_path}'"
     sh "sleep 1"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: choctop
 version: !ruby/object:Gem::Version 
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-16 00:00:00 +10:00
+date: 2009-11-17 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency