choctop 0.9.5 → 0.9.6

data/History.txt

@@ -1,3 +1,11 @@
+== 0.9.6 2009-02-10
+
+* Custom Applications Icons!!!
+* New config option: s.application_icon = "xxx.png"
+* New config option: s.icon_text_size = 12
+* rake dmg NO_BUILD=1 will skip the build step
+* The background image no longer appears in the "real time" design of the DMG as its in .background folder
+
 == 0.9.5 2009-02-03
 
 * Fixed whitespace in project names bug

data/Manifest.txt

@@ -42,14 +42,14 @@ features/fixtures/SampleApp/SampleApp.xcodeproj/TemplateIcon.icns
 features/fixtures/SampleApp/SampleApp.xcodeproj/project.pbxproj
 features/fixtures/SampleApp/SampleApp_Prefix.pch
 features/fixtures/SampleApp/main.m
-features/fixtures/design/background.jpg
-features/fixtures/design/ds_store
+features/fixtures/custom_assets/appicon.icns
 features/initial_generator.feature
 features/rake_tasks.feature
 features/sparkle_feed.feature
 features/steps/common.rb
 features/steps/dmg_steps.rb
 features/steps/env.rb
+features/steps/file_attribute_steps.rb
 features/steps/generator.rb
 features/steps/remote.rb
 features/steps/xcode_steps.rb

data/README.rdoc

@@ -106,7 +106,7 @@ its set to Debug for development) and then Build. The "rake appcast" task should
     
 == SPONSORED BY:
 
-http//mocra.com - Mocra - the premier Rails/iPhone consultancy
+http://mocra.com - Mocra - the premier Rails/iPhone consultancy
 
 == LICENSE:
 

data/app_generators/install_choctop/templates/Rakefile.erb

@@ -14,4 +14,5 @@ ChocTop.new do |s|
   # s.app_icon_position = [100, 90]
   # s.applications_icon_position =  [400, 90]
   # s.volume_icon = "dmg.icns"
+  # s.applications_icon = "appicon.icns" # or "appicon.png"
 end

data/features/dmg.feature

@@ -10,8 +10,8 @@ Feature: Can build a customised DMG image from application build
     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.jpg' in mounted volume is created
-    And file 'background.jpg' in mounted volume is invisible
+    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
@@ -21,6 +21,19 @@ Feature: Can build a customised DMG image from application build
     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.jpg' in mounted volume is created
-    And file 'background.jpg' in mounted volume is invisible
+    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
+    When task 'rake dmg' is invoked
+    And dmg 'appcast/build/SampleApp-0.1.0.dmg' is mounted as 'SampleApp'
+    Then file 'Applications' in mounted volume is created
+    And file 'Applications' in mounted volume has GetFileInfo type '"fdrp"'
+    And file 'Applications' in mounted volume has GetFileInfo alias '1'
+    And file 'Applications' in mounted volume has GetFileInfo custom icon '1'
+    And file 'Applications' in mounted volume is aliased to '/Applications'
+
+

data/features/steps/dmg_steps.rb

@@ -1,3 +1,13 @@
+Given /is configured for custom Applications icon$/ do
+  appicon = File.expand_path(File.dirname(__FILE__) + "/../fixtures/custom_assets/appicon.icns")
+  in_project_folder do
+    append_to_file "Rakefile", <<-RUBY.gsub(/^    /, '')
+    $sparkle.applications_icon = "appicon.icns"
+    RUBY
+    FileUtils.cp(appicon, "appicon.icns")
+  end
+end
+
 When /^dmg '(.*)' is mounted as '(.*)'$/ do |dmg, name|
   @stdout = File.expand_path(File.join(@tmp_root, "hdiutil.out"))
   in_project_folder do
@@ -29,3 +39,4 @@ Then /^file '(.*)' in mounted volume (is|is not) invisible$/ do |file, is|
     `GetFileInfo -aV '#{@volume_path}/#{file}'`.to_i.should_not == (is == 'is' ? 0 : 1)
   end
 end
+

data/features/steps/file_attribute_steps.rb

@@ -0,0 +1,16 @@
+Then /^file '(.*)' in mounted volume has GetFileInfo (.*) '(.*)'/ do |file, file_info_type, value|
+  flags = case file_info_type.to_sym
+  when :type; "-t"
+  when :alias; "-aa"
+  when :"custom icon"; "-ac"
+  end
+  in_mounted_volume do
+    `GetFileInfo #{flags} '#{file}'`.strip.should == value
+  end
+end
+
+Then /^file '(.*)' in mounted volume is aliased to '(.*)'/ do |file, target|
+  in_mounted_volume do
+    puts "TODO - how to get applescript to test this?"
+  end
+end

data/lib/choctop.rb

@@ -10,7 +10,7 @@ require "active_support"
 require "RedCloth"
 
 class ChocTop
-  VERSION = '0.9.5'
+  VERSION = '0.9.6'
   
   # The name of the Cocoa application
   # Default: info_plist['CFBundleExecutable'] or project folder name if "${EXECUTABLE_NAME}"
@@ -110,10 +110,23 @@ class 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
@@ -144,6 +157,7 @@ class ChocTop
     @applications_icon_position = [347, 270]
     @volume_icon = File.dirname(__FILE__) + "/../assets/DefaultVolumeIcon.icns"
     @icon_size = 104
+    @icon_text_size = 12
     
     yield self if block_given?
 

data/lib/choctop/appcast.rb

@@ -1,6 +1,10 @@
 module ChocTop::Appcast
   def make_build
-    sh "xcodebuild -configuration Release"
+    if ENV['NO_BUILD']
+      puts "Skipping build task..."
+    else
+      sh "xcodebuild -configuration Release"
+    end
   end
   
   def make_appcast

data/lib/choctop/dmg.rb

@@ -6,20 +6,15 @@ module ChocTop::Dmg
     sh "hdiutil create -format UDRW -quiet -volname '#{name}' -srcfolder 'build/Release/#{target}' '#{pkg}'"
     sh "hdiutil attach '#{pkg}' -mountpoint '#{volume_path}' -noautoopen -quiet"
     sh "bless --folder '#{volume_path}' --openfolder '#{volume_path}'"
-    sh "ln -s /Applications '#{volume_path}/Applications'"
     sh "sleep 1"
-    if volume_icon
-      FileUtils.cp(volume_icon, "#{volume_path}/.VolumeIcon.icns")
-      sh "SetFile -a C '#{volume_path}'"
-    end
-    target_background = "#{volume_path}/#{volume_background}"
-    FileUtils.cp(background_file, target_background) if background_file
+
+    configure_volume_icon
+    configure_applications_icon
     configure_dmg_window
-    sh "SetFile -a V '#{target_background}'" if background_file
   end
   
   def volume_background
-    "background#{File.extname(background_file)}"
+    ".background/background#{File.extname(background_file)}"
   end
   
   def window_position
@@ -37,49 +32,66 @@ module ChocTop::Dmg
     [background.first, background.last + statusbar_height]
   end
   
-  def statusbar_height
-    20
-  end
+  def statusbar_height; 20; end
   
+  def configure_volume_icon
+    if volume_icon
+      FileUtils.cp(volume_icon, "#{volume_path}/.VolumeIcon.icns")
+      sh "SetFile -a C '#{volume_path}'"
+    end
+  end
+
   def configure_dmg_window
-    applescript = <<-SCRIPT
-    tell application "Finder"
-       set mountpoint to POSIX file ("#{volume_path}" as string) as alias
-       tell folder mountpoint
-           open
-           tell container window
-              set toolbar visible to false
-              set statusbar visible to false -- doesn't do anything at DMG open time
-              set current view to icon view
-              delay 1 -- Sync
-              set the bounds to {#{window_bounds.join(", ")}}
-           end tell
-           delay 1 -- Sync
-           set icon size of the icon view options of container window to #{icon_size}
-           set arrangement of the icon view options of container window to not arranged
-           set position of item "#{target}" to {#{app_icon_position.join(", ")}}
-           set position of item "Applications" to {#{applications_icon_position.join(", ")}}
-           set the bounds of the container window to {#{window_bounds.join(", ")}}
-           set background picture of the icon view options of container window to file "#{File.basename volume_background}"
-           update without registering applications
-           delay 5 -- Sync
-           close
-       end tell
-       -- Sync
-       delay 5
-    end tell
-    SCRIPT
-    File.open(scriptfile = "/tmp/choctop-script", "w") do |f|
-      f << applescript
+    if background_file
+      target_background = "#{volume_path}/#{volume_background}"
+      FileUtils.mkdir_p(File.dirname(target_background))
+      FileUtils.cp(background_file, target_background) 
     end
-    sh("osascript #{scriptfile}") do |ok, res|
-      if ! ok
-        p res
-        puts volume_path
-        exit 1
-      end
+    run_applescript <<-SCRIPT.gsub(/^      /, '')
+      tell application "Finder"
+         set mountpoint to POSIX file ("#{volume_path}" as string) as alias
+         tell folder mountpoint
+             open
+             tell container window
+                set toolbar visible to false
+                set statusbar visible to false -- doesn't do anything at DMG open time
+                set current view to icon view
+                delay 1 -- Sync
+                set the bounds to {#{window_bounds.join(", ")}}
+             end tell
+             delay 1 -- Sync
+             set icon size of the icon view options of container window to #{icon_size}
+             set text size of the icon view options of container window to #{icon_text_size}
+             set arrangement of the icon view options of container window to not arranged
+             set position of item "#{target}" to {#{app_icon_position.join(", ")}}
+             set position of item "Applications" to {#{applications_icon_position.join(", ")}}
+             set the bounds of the container window to {#{window_bounds.join(", ")}}
+             set background picture of the icon view options of container window to file "#{volume_background.gsub(/\//,':')}"
+             update without registering applications
+             delay 5 -- Sync
+             close
+         end tell
+         -- Sync
+         delay 5
+      end tell
+    SCRIPT
+    sh "SetFile -a V '#{target_background}'" if background_file
+  end
+  
+  def configure_applications_icon
+    run_applescript <<-SCRIPT.gsub(/^      /, ''), "apps_icon_script"
+      tell application "Finder"
+        set dest to disk "#{name}"
+        set src to folder "Applications" of startup disk
+        make new alias at dest to src
+      end tell
+    SCRIPT
+    if applications_icon
+      applications_path = "#{volume_path}/Applications"
+      OSX::NSApplicationLoad()
+      image = OSX::NSImage.alloc.initWithContentsOfFile(applications_icon)
+      OSX::NSWorkspace.sharedWorkspace.setIcon_forFile_options(image, applications_path, nil)
     end
-    applescript
   end
   
   def detach_dmg
@@ -107,6 +119,20 @@ module ChocTop::Dmg
   	# hdiutil flatten $@
   	
   end
+  
+  def run_applescript(applescript, tmp_file = "choctop-script")
+    File.open(scriptfile = "/tmp/#{tmp_file}", "w") do |f|
+      f << applescript
+    end
+    sh("osascript #{scriptfile}") do |ok, res|
+      if ! ok
+        p res
+        puts volume_path
+        exit 1
+      end
+    end
+    applescript
+  end
 end
 ChocTop.send(:include, ChocTop::Dmg)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: choctop
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-03 00:00:00 +10:00
+date: 2009-02-10 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -120,14 +120,14 @@ files:
 - features/fixtures/SampleApp/SampleApp.xcodeproj/project.pbxproj
 - features/fixtures/SampleApp/SampleApp_Prefix.pch
 - features/fixtures/SampleApp/main.m
-- features/fixtures/design/background.jpg
-- features/fixtures/design/ds_store
+- features/fixtures/custom_assets/appicon.icns
 - features/initial_generator.feature
 - features/rake_tasks.feature
 - features/sparkle_feed.feature
 - features/steps/common.rb
 - features/steps/dmg_steps.rb
 - features/steps/env.rb
+- features/steps/file_attribute_steps.rb
 - features/steps/generator.rb
 - features/steps/remote.rb
 - features/steps/xcode_steps.rb