choctop 0.14.0 → 0.14.1

data/History.txt

@@ -1,3 +1,9 @@
+== 0.14.1 2010-08-01
+
+* add option to automatically mount the dmg created by the 'dmg' rake task [george]
+* tag-activated ("@unmount_dmg") cucumber (After) hook to unmount disk images used for testing [george]
+* cucumber tests folder aliasing in mounted volume via a call to osascript and an external AppleScript file [george]
+
 == 0.14.0 2010-07-30
 
 * install_choctop: added --tmbundle/--textmate flag

data/README.rdoc

@@ -19,7 +19,7 @@ and XML file to your remote host via rsync.
 
 All rake tasks:
     rake build               # Build Xcode Release
-    rake dmg                 # Create the dmg file for appcasting
+		rake dmg[automount]      # Create the dmg file for appcasting (`rake dmg`, or `rake dmg[automount]` to automatically mount the dmg)
     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.

data/features/dmg.feature

@@ -3,6 +3,7 @@ Feature: Can build a customised DMG image from application build
   As a Cocoa developer or release manager
   I want a rake task to generate a DMG based on custom settings
 
+@unmount_dmg
   Scenario: Build a DMG with default custom DMG config
     Given a Cocoa app with choctop installed called "SampleApp"
     When I invoke task "rake dmg"
@@ -14,6 +15,7 @@ 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
 
+@unmount_dmg
   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
@@ -25,6 +27,7 @@ Feature: Can build a customised DMG image from application build
     And file "Applications" in mounted volume has GetFileInfo custom icon "1"
     And file "Applications" in mounted volume is aliased to "/Applications"
   
+@unmount_dmg
   Scenario: Build a DMG with extra included file such as README in the project folder
     Given a Cocoa app with choctop installed called "SampleApp"
     And is configured for an asset file "README.txt" to be included in dmg
@@ -33,6 +36,7 @@ Feature: Can build a customised DMG image from application build
     And file "README.txt" in mounted volume is created
     And file "SampleApp.app.dSYM" in mounted volume is not created
 
+@unmount_dmg
   Scenario: Build a DMG for non-Xcode project
     Given a non-Xcode chcotop project "MyProject" with files: README.txt, SomeBundle.thingy
     When I invoke task "rake dmg"
@@ -41,6 +45,7 @@ Feature: Can build a customised DMG image from application build
     And file "SomeBundle.thingy" in mounted volume is created
     And file "Applications" in mounted volume is not created
 
+@unmount_dmg
   Scenario: Build a DMG for the entire project as an item (textmate bundle)
     Given a TextMate bundle project "MyBundle.tmbundle"
     When I invoke task "rake dmg"
@@ -48,6 +53,7 @@ Feature: Can build a customised DMG image from application build
     And file "MyBundle.tmbundle" in mounted volume is created
     And file "Applications" in mounted volume is not created
   
+@unmount_dmg
   Scenario: Build a DMG with a URL webloc file
     Given a TextMate bundle project "MyBundle.tmbundle"
     And I want a link "GitHub.webloc" to "http://github.com/drnic/choctop" in the DMG

data/features/step_definitions/file_attribute_steps.rb

@@ -9,8 +9,10 @@ Then /^file "(.*)" in mounted volume has GetFileInfo (.*) "(.*)"/ do |file, file
   end
 end
 
-Then /^file "(.*)" in mounted volume is aliased to "(.*)"/ do |file, target|
+Then /^file "(.*)" in mounted volume is aliased to "\/(.*)"/ do |folder_alias, target|
   in_mounted_volume do
-    puts "TODO - how to get applescript to test this?"
+    disk_name = `pwd`.chomp.split("/").last # HACK and an ugly on at that
+    folder_alias_url = `osascript #{File.join(File.dirname(__FILE__), "../support/get_folder_alias_target_url.scpt")} #{folder_alias} #{disk_name}`.chomp
+    folder_alias_url.should == "file://localhost/#{target}/"
   end
 end

data/lib/choctop.rb

@@ -18,7 +18,7 @@ module ChocTop
     include Dmg
     include RakeTasks
   
-    VERSION = '0.14.0'
+    VERSION = '0.14.1'
   
     attr_writer :build_opts
     def build_opts

data/lib/choctop/dmg.rb

@@ -46,7 +46,7 @@ module ChocTop
       FileUtils.mkdir_p mountpoint # TODO can we remove random mountpoints?
       FileUtils.rm_f(pkg) # make sure destination pkg doesn't already exist, or hdiutil will barf
       sh "hdiutil create -format UDRW -quiet -volname '#{name}' -srcfolder '#{dmg_src_folder}' '#{pkg}'"
-      sh "hdiutil attach '#{pkg}' -mountpoint '#{volume_path}' -noautoopen -quiet"
+      mount_dmg
       sh "bless --folder '#{volume_path}' --openfolder '#{volume_path}'"
       sh "sleep 1"
 
@@ -56,6 +56,10 @@ module ChocTop
       configure_applications_icon if include_applications_icon?
       configure_dmg_window
     end
+    
+    def mount_dmg
+      sh "hdiutil attach '#{pkg}' -mountpoint '#{volume_path}' -noautoopen -quiet"
+    end
 
     def volume_background
       ".background/background#{File.extname(background_file)}"

data/lib/choctop/rake_tasks.rb

@@ -14,13 +14,16 @@ module ChocTop
         FileUtils.rm_rf(build_path)
       end
 
-      desc "Create the dmg file for appcasting"
-      task :dmg => :build do
+      desc "Create the dmg file for appcasting (`rake dmg`, or `rake dmg[automount]` to automatically mount the dmg)"
+      task :dmg, :automount, :needs => :build do |t, args|
+        args.with_defaults(:automount => false)
+        
         detach_dmg
         make_dmg
         detach_dmg
         convert_dmg_readonly
         add_eula
+        mount_dmg if args[:automount]
       end
 
       desc "Create/update the appcast file"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: choctop
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 37
   prerelease: false
   segments: 
   - 0
   - 14
-  - 0
-  version: 0.14.0
+  - 1
+  version: 0.14.1
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-30 00:00:00 +10:00
+date: 2010-08-01 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -139,7 +139,8 @@ description: "Build and deploy tools for Cocoa apps using Sparkle for distributi
   The main feature is a powerful rake task \"rake appcast\" which builds a release of your\n\
   application, creates a DMG package, generates a Sparkle XML file, and posts the package\n\
   and XML file to your remote host via rsync.\n\n\
-  All rake tasks:\n    rake build               # Build Xcode Release\n    rake dmg                 # Create the dmg file for appcasting\n    rake feed                # Create/update the appcast file\n    rake upload              # Upload the appcast file to the host\n    rake version:bump:major  # Bump the gemspec by a major version.\n    rake version:bump:minor  # Bump the gemspec by a minor version.\n    rake version:bump:patch  # Bump the gemspec by a patch version.\n    rake version:current     # Display the current version"
+  All rake tasks:\n    rake build               # Build Xcode Release\n\
+  \t\trake dmg[automount]      # Create the dmg file for appcasting (`rake dmg`, or `rake dmg[automount]` to automatically mount the dmg)\n    rake feed                # Create/update the appcast file\n    rake upload              # Upload the appcast file to the host\n    rake version:bump:major  # Bump the gemspec by a major version.\n    rake version:bump:minor  # Bump the gemspec by a minor version.\n    rake version:bump:patch  # Bump the gemspec by a patch version.\n    rake version:current     # Display the current version"
 email: 
 - drnicwilliams@gmail.com
 - chris@cobaltedge.com