choctop 0.11.1 → 0.12.0

data/lib/choctop/appcast.rb

@@ -1,118 +1,125 @@
-module ChocTop::Appcast
-  def make_build
-    if skip_build
-      puts "Skipping build task..."
-    else
-      sh "xcodebuild -configuration #{build_type}"
+module ChocTop
+  module Appcast
+    def make_build
+      if skip_build
+        puts "Skipping build task..."
+      else
+        sh "xcodebuild -configuration #{build_type} -target #{build_target} #{build_opts}"
+      end
     end
-  end
-  
-  def make_appcast
-    app_name = File.basename(File.expand_path('.'))
-    FileUtils.mkdir_p(build_path)
-    appcast = File.open("#{build_path}/#{appcast_filename}", 'w') do |f|
-      xml = Builder::XmlMarkup.new(:indent => 2)
-      xml.instruct!
-      xml_string = xml.rss('xmlns:atom' => "http://www.w3.org/2005/Atom",
-              'xmlns:sparkle' => "http://www.andymatuschak.org/xml-namespaces/sparkle", 
-              :version => "2.0") do
-        xml.channel do
-          xml.title(app_name)
-          xml.description("#{app_name} updates")
-          xml.link(base_url)
-          xml.language('en')
-          xml.pubDate Time.now.to_s(:rfc822)
-          # xml.lastBuildDate(Time.now.rfc822)
-          xml.atom(:link, :href => "#{base_url}/#{appcast_filename}", 
-                   :rel => "self", :type => "application/rss+xml")
 
-          xml.item do
-            xml.title("#{name} #{version}")
-            xml.tag! "sparkle:releaseNotesLink", "#{base_url}/#{release_notes}"
-            xml.pubDate Time.now.to_s(:rfc822) #(File.mtime(pkg))
-            xml.guid("#{name}-#{version}", :isPermaLink => "false")
-            xml.enclosure(:url => "#{base_url}/#{pkg_name}", 
-                          :length => "#{File.size(pkg)}", 
-                          :type => "application/dmg",
-                          :"sparkle:version" => version,
-                          :"sparkle:dsaSignature" => dsa_signature)
+    def make_appcast
+      FileUtils.mkdir_p(build_path)
+      appcast = File.open("#{build_path}/#{appcast_filename}", 'w') do |f|
+        xml = Builder::XmlMarkup.new(:indent => 2)
+        xml.instruct!
+        xml_string = xml.rss('xmlns:atom' => "http://www.w3.org/2005/Atom",
+                             'xmlns:sparkle' => "http://www.andymatuschak.org/xml-namespaces/sparkle",
+                             :version => "2.0") do
+          xml.channel do
+            xml.title(@name)
+            xml.description("#{@name} updates")
+            xml.link(base_url)
+            xml.language('en')
+            xml.pubDate( Time.now.strftime("%a, %d %b %Y %H:%M:%S %z") )
+            # xml.lastBuildDate(Time.now.rfc822)
+            xml.atom(:link, :href => "#{base_url}/#{appcast_filename}",
+                     :rel => "self", :type => "application/rss+xml")
+
+            xml.item do
+              xml.title("#{name} #{version}")
+              xml.tag! "sparkle:releaseNotesLink", "#{base_url}/#{release_notes}"
+              xml.pubDate Time.now.strftime("%a, %d %b %Y %H:%M:%S %z")
+              xml.guid("#{name}-#{version}", :isPermaLink => "false")
+              xml.enclosure(:url => "#{base_url}/#{pkg_name}",
+                            :length => "#{File.size(pkg)}",
+                            :type => "application/dmg",
+                            :"sparkle:version" => version,
+                            :"sparkle:dsaSignature" => dsa_signature)
+            end
           end
         end
+        f << xml_string
       end
-      f << xml_string
     end
-  end
-  
-  def make_dmg_symlink
-    FileUtils.chdir(build_path) do
-      `ln -s #{pkg_name} #{versionless_pkg_name}`
+
+    def make_dmg_symlink
+      FileUtils.chdir(build_path) do
+        `rm '#{versionless_pkg_name}'`
+        `ln -s '#{pkg_name}' '#{versionless_pkg_name}'`
+      end
     end
-  end
-  
-  def make_index_redirect
-    File.open("#{build_path}/index.php", 'w') do |f|
-      f << %Q{<?php header("Location: #{pkg_relative_url}"); ?>}
+
+    def make_index_redirect
+      File.open("#{build_path}/index.php", 'w') do |f|
+        f << %Q{<?php header("Location: #{pkg_relative_url}"); ?>}
+      end
     end
-  end
-  
-  def skip_build
-    return true if ENV['NO_BUILD']
-    return false if File.exists?('Info.plist')
-    return false if Dir['*.xcodeproj'].size > 0
-    true
-  end
-  
-  def make_release_notes
-    File.open("#{build_path}/#{release_notes}", "w") do |f|
-      template = File.read(release_notes_template)
-      f << ERB.new(template).result(binding)
+
+    def skip_build
+      return true if ENV['NO_BUILD']
+      return false if File.exists?('Info.plist')
+      return false if Dir['*.xcodeproj'].size > 0
+      true
     end
-  end
-  
-  def release_notes_content
-    if File.exists?("release_notes.txt")
-      File.read("release_notes.txt")
-    else
-      <<-TEXTILE.gsub(/^      /, '')
-      h1. #{version} #{Date.today}
-      
-      h2. Another awesome release!
-      TEXTILE
+
+    def make_release_notes
+      File.open("#{build_path}/#{release_notes}", "w") do |f|
+        template = File.read(release_notes_template)
+        f << ERB.new(template).result(binding)
+      end
     end
-  end
-  
-  def release_notes_html
-    RedCloth.new(release_notes_content).to_html
-  end
 
-  def upload_appcast
-    _host = host.blank? ? "" : "#{host}:"
-    _user = user.blank? ? "" : "#{user}@"
-    sh %{rsync #{rsync_args} #{build_path}/ #{_user}#{_host}#{remote_dir}}
-  end
-  
-  # Returns a file path to the dsa_priv.pem file
-  # If private key + public key haven't been generated yet then
-  # generate them
-  def private_key
-    unless File.exists?('dsa_priv.pem')
-      puts "Creating new private and public keys for signing the DMG..."
-      `openssl dsaparam 2048 < /dev/urandom > dsaparam.pem`
-      `openssl gendsa dsaparam.pem -out dsa_priv.pem`
-      `openssl dsa -in dsa_priv.pem -pubout -out dsa_pub.pem`
-      `rm dsaparam.pem`
-      puts <<-EOS.gsub(/^      /, '')
-      
-      WARNING: DO NOT PUT dsa_priv.pem IN YOUR SOURCE CONTROL
-               Remember to add it to your ignore list
-      
-      EOS
+    def release_notes_content
+      if File.exists?("release_notes.txt")
+        File.read("release_notes.txt")
+      else
+        <<-TEXTILE.gsub(/^      /, '')
+        h1. #{version} #{Date.today}
+
+        h2. Another awesome release!
+        TEXTILE
+      end
+    end
+
+    def release_notes_html
+      RedCloth.new(release_notes_content).to_html
+    end
+
+    def upload_appcast
+      _host = host.blank? ? "" : host
+      _user = user.blank? ? "" : "#{user}@"
+      case transport
+      when :scp
+        # this is whack, really, work out your rsync options
+        sh %{scp #{scp_args} #{build_path}/* #{_user}#{_host}:#{remote_dir}}
+      else # default to rsync as per original
+        sh %{rsync #{rsync_args} #{build_path}/ #{_user}#{_host}:#{remote_dir}}
+      end
+    end
+
+    # Returns a file path to the dsa_priv.pem file
+    # If private key + public key haven't been generated yet then
+    # generate them
+    def private_key
+      unless File.exists?('dsa_priv.pem')
+        puts "Creating new private and public keys for signing the DMG..."
+        `openssl dsaparam 2048 < /dev/urandom > dsaparam.pem`
+        `openssl gendsa dsaparam.pem -out dsa_priv.pem`
+        `openssl dsa -in dsa_priv.pem -pubout -out dsa_pub.pem`
+        `rm dsaparam.pem`
+        puts <<-EOS.gsub(/^      /, '')
+
+        WARNING: DO NOT PUT dsa_priv.pem IN YOUR SOURCE CONTROL
+                 Remember to add it to your ignore list
+
+        EOS
+      end
+      File.expand_path('dsa_priv.pem')
+    end
+
+    def dsa_signature
+      @dsa_signature ||= `openssl dgst -sha1 -binary < "#{pkg}" | openssl dgst -dss1 -sign "#{private_key}" | openssl enc -base64`
     end
-    File.expand_path('dsa_priv.pem')
-  end
-  
-  def dsa_signature
-    @dsa_signature ||= `openssl dgst -sha1 -binary < "#{pkg}" | openssl dgst -dss1 -sign "#{private_key}" | openssl enc -base64`
   end
-end
-ChocTop.send(:include, ChocTop::Appcast)
+end

data/lib/choctop/dmg.rb

@@ -1,189 +1,193 @@
-module ChocTop::Dmg
-  def prepare_files
-    self.files = files.inject({}) do |files, file|
-      path_or_helper, options = file
-      path = case path_or_helper
-        when Symbol
-          send path_or_helper
-        when Proc
-          path_or_helper.call
-        else
-          path_or_helper
+module ChocTop
+  module Dmg
+    def prepare_files
+      self.files = files.inject({}) do |files, file|
+        path_or_helper, options = file
+        path = case path_or_helper
+          when Symbol
+            send path_or_helper
+          when Proc
+            path_or_helper.call
+          else
+            path_or_helper
+        end
+        files[path] = options if path && File.exists?(path) && File.basename(path) != '.'
+        files
       end
-      files[path] = options if path && File.exists?(path) && File.basename(path) != '.'
-      files
     end
-  end
-  
-  def copy_files
-    FileUtils.mkdir_p(dmg_pkg_folder)
-    files.each do |path, options|
-      FileUtils.cp_r(path, dmg_pkg_folder)
+
+    def copy_files
+      FileUtils.rm_r(src_folder) if File.exists? src_folder
+      FileUtils.mkdir_p(src_folder)
+      files.each do |path, options|
+        FileUtils.cp_r(path, src_folder)
+      end
     end
-  end
-  
-  def make_dmg
-    prepare_files
-    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 '#{dmg_pkg_folder}' '#{pkg}'"
-    sh "hdiutil attach '#{pkg}' -mountpoint '#{volume_path}' -noautoopen -quiet"
-    sh "bless --folder '#{volume_path}' --openfolder '#{volume_path}'"
-    sh "sleep 1"
-
-    puts "volume_icon: #{volume_icon.inspect}"
-    puts "include_applications_icon?: #{include_applications_icon?.inspect}"
-    configure_volume_icon
-    configure_applications_icon if include_applications_icon?
-    configure_dmg_window
-  end
-  
-  def volume_background
-    ".background/background#{File.extname(background_file)}"
-  end
-  
-  def window_position
-    [50, 100]
-  end
-  
-  def window_bounds
-    window_position + 
-    window_position.zip(background_bounds).map { |w, b| w + b }
-  end
-  
-  def background_bounds
-    return [400, 300] unless background_file
-    background = OSX::NSImage.alloc.initByReferencingFile(background_file).size.to_a
-    [background.first, background.last + statusbar_height]
-  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}'"
+
+    def make_dmg
+      prepare_files
+      copy_files
+      FileUtils.mkdir_p build_path
+      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 '#{src_folder}' '#{pkg}'"
+      sh "hdiutil attach '#{pkg}' -mountpoint '#{volume_path}' -noautoopen -quiet"
+      sh "bless --folder '#{volume_path}' --openfolder '#{volume_path}'"
+      sh "sleep 1"
+
+      puts "volume_icon: #{volume_icon.inspect}"
+      puts "include_applications_icon?: #{include_applications_icon?.inspect}"
+      configure_volume_icon
+      configure_applications_icon if include_applications_icon?
+      configure_dmg_window
     end
-  end
 
-  def configure_dmg_window
-    if background_file
-      target_background = "#{volume_path}/#{volume_background}"
-      FileUtils.mkdir_p(File.dirname(target_background))
-      FileUtils.cp(background_file, target_background) 
-    end
-    script = <<-SCRIPT.gsub(/^      /, '')
-      tell application "Finder"
-         set applications_folder to displayed name of (path to applications folder) -- i18n
-         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_files}
-             #{set_position_of_shortcuts}
-             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
-    run_applescript(script)
-    sh "SetFile -a V '#{target_background}'" if background_file
-  end
-  
-  def set_position_of_files
-    files.map do |file_options|
-      path, options = file_options
-      target        = File.basename(path)
-      position      = options[:position].join(", ")
-      %Q{set position of item "#{target}" to {#{position}}}
-    end.join("\n")
-  end
-  
-  def set_position_of_shortcuts
-    if include_applications_icon?
-      %Q{set position of item applications_folder to {#{applications_icon_position.join(", ")}}}
-    else
-      ""
+    def volume_background
+      ".background/background#{File.extname(background_file)}"
     end
-  end
-  
-  def include_applications_icon?
-    puts "target: #{target.inspect}"
-    target =~ /.app$/
-  end
-  
-  def configure_applications_icon
-    run_applescript <<-SCRIPT.gsub(/^      /, ''), "apps_icon_script"
-      tell application "Finder"
-        set applications_folder to displayed name of (path to applications folder) -- i18n
-        set dest to disk "#{name}"
-        set src to folder applications_folder 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)
+
+    def window_position
+      [50, 100]
     end
-  end
-  
-  def detach_dmg
-    mounted_paths = `hdiutil info | grep '#{volume_path}' | grep "Apple_HFS"`.split("\n").map { |e| e.split(" ").first }
-    mounted_paths.each do |path|
-      begin
-        sh "hdiutil detach '#{path}' -quiet -force"
-      rescue StandardError => e
-        p e
+
+    def window_bounds
+      window_position + 
+      window_position.zip(background_bounds).map { |w, b| w + b }
+    end
+
+    def background_bounds
+      return [400, 300] unless background_file
+      background = OSX::NSImage.alloc.initByReferencingFile(background_file).size.to_a
+      [background.first, background.last + statusbar_height]
+    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
-  end
-  
-  def convert_dmg_readonly
-    tmp_path = "/tmp/rw.dmg"
-    FileUtils.mv(pkg, tmp_path)
-    sh "hdiutil convert '#{tmp_path}' -format UDZO -imagekey zlib-level=9 -o '#{pkg}'"
-  end
-  
-  def add_eula
-    # TODO support EULA
-    # hdiutil unflatten $@
-  	# /Developer/Tools/DeRez -useDF SLAResources.rsrc > build/temp/sla.r
-  	# /Developer/Tools/Rez -a build/temp/sla.r -o $@
-  	# 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
+
+    def configure_dmg_window
+      if background_file
+        target_background = "#{volume_path}/#{volume_background}"
+        FileUtils.mkdir_p(File.dirname(target_background))
+        FileUtils.cp(background_file, target_background) 
       end
+      script = <<-SCRIPT.gsub(/^      /, '')
+        tell application "Finder"
+           set applications_folder to displayed name of (path to applications folder) -- i18n
+           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_files}
+               #{set_position_of_shortcuts}
+               close
+               open
+               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
+      puts "script: #{script}"
+      run_applescript(script)
+      sh "SetFile -a V '#{target_background}'" if background_file
     end
-    applescript
-  end
-end
-ChocTop.send(:include, ChocTop::Dmg)
 
+    def set_position_of_files
+      files.map do |file_options|
+        path, options = file_options
+        target        = File.basename(path)
+        position      = options[:position].join(", ")
+        %Q{set position of item "#{target}" to {#{position}}}
+      end.join("\n")
+    end
+
+    def set_position_of_shortcuts
+      if include_applications_icon?
+        %Q{set position of item applications_folder to {#{applications_icon_position.join(", ")}}}
+      else
+        ""
+      end
+    end
+
+    def include_applications_icon?
+      target =~ /.app$/
+    end
+
+    def configure_applications_icon
+      run_applescript <<-SCRIPT.gsub(/^      /, ''), "apps_icon_script"
+        tell application "Finder"
+          set applications_folder to displayed name of (path to applications folder) -- i18n
+          set dest to disk "#{name}"
+          set src to folder applications_folder 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
+    end
+
+    def detach_dmg
+      mounted_paths = `hdiutil info | grep '#{volume_path}' | grep "Apple_HFS"`.split("\n").map { |e| e.split(" ").first }
+      mounted_paths.each do |path|
+        begin
+          sh "hdiutil detach '#{path}' -quiet -force"
+        rescue StandardError => e
+          p e
+        end
+      end
+    end
+
+    def convert_dmg_readonly
+      tmp_path = "/tmp/rw.dmg"
+      FileUtils.mv(pkg, tmp_path)
+      sh "hdiutil convert '#{tmp_path}' -format UDZO -imagekey zlib-level=9 -o '#{pkg}'"
+    end
+
+    def add_eula
+      # TODO support EULA
+      # hdiutil unflatten $@
+    	# /Developer/Tools/DeRez -useDF SLAResources.rsrc > build/temp/sla.r
+    	# /Developer/Tools/Rez -a build/temp/sla.r -o $@
+    	# 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
+end