choctop 0.13.0 → 0.13.1

data/.bundle/environment.rb

@@ -196,10 +196,10 @@ module Bundler
         {:loaded_from=>"/Users/drnic/.bundle/ruby/1.8/specifications/rubigen-1.5.5.gemspec", :name=>"rubigen", :load_paths=>["/Users/drnic/.bundle/ruby/1.8/gems/rubigen-1.5.5/lib"]},
         {:loaded_from=>"/Library/Ruby/Gems/1.8/specifications/syntax-1.0.0.gemspec", :name=>"syntax", :load_paths=>["/Library/Ruby/Gems/1.8/gems/syntax-1.0.0/lib"]},
         {:loaded_from=>"/Library/Ruby/Gems/1.8/specifications/newgem-1.5.3.gemspec", :name=>"newgem", :load_paths=>["/Library/Ruby/Gems/1.8/gems/newgem-1.5.3/lib"]},
-        {:loaded_from=>"/Users/drnic/.bundle/ruby/1.8/specifications/rspec-core-2.0.0.beta.15.gemspec", :name=>"rspec-core", :load_paths=>["/Users/drnic/.bundle/ruby/1.8/gems/rspec-core-2.0.0.beta.15/lib"]},
-        {:loaded_from=>"/Users/drnic/.bundle/ruby/1.8/specifications/rspec-expectations-2.0.0.beta.15.gemspec", :name=>"rspec-expectations", :load_paths=>["/Users/drnic/.bundle/ruby/1.8/gems/rspec-expectations-2.0.0.beta.15/lib"]},
-        {:loaded_from=>"/Users/drnic/.bundle/ruby/1.8/specifications/rspec-mocks-2.0.0.beta.15.gemspec", :name=>"rspec-mocks", :load_paths=>["/Users/drnic/.bundle/ruby/1.8/gems/rspec-mocks-2.0.0.beta.15/lib"]},
-        {:loaded_from=>"/Users/drnic/.bundle/ruby/1.8/specifications/rspec-2.0.0.beta.15.gemspec", :name=>"rspec", :load_paths=>["/Users/drnic/.bundle/ruby/1.8/gems/rspec-2.0.0.beta.15/lib"]},
+        {:loaded_from=>"/Library/Ruby/Gems/1.8/specifications/rspec-core-2.0.0.beta.16.gemspec", :name=>"rspec-core", :load_paths=>["/Library/Ruby/Gems/1.8/gems/rspec-core-2.0.0.beta.16/lib"]},
+        {:loaded_from=>"/Library/Ruby/Gems/1.8/specifications/rspec-expectations-2.0.0.beta.16.gemspec", :name=>"rspec-expectations", :load_paths=>["/Library/Ruby/Gems/1.8/gems/rspec-expectations-2.0.0.beta.16/lib"]},
+        {:loaded_from=>"/Library/Ruby/Gems/1.8/specifications/rspec-mocks-2.0.0.beta.16.gemspec", :name=>"rspec-mocks", :load_paths=>["/Library/Ruby/Gems/1.8/gems/rspec-mocks-2.0.0.beta.16/lib"]},
+        {:loaded_from=>"/Library/Ruby/Gems/1.8/specifications/rspec-2.0.0.beta.16.gemspec", :name=>"rspec", :load_paths=>["/Library/Ruby/Gems/1.8/gems/rspec-2.0.0.beta.16/lib"]},
       ].map do |hash|
     if hash[:virtual_spec]
       spec = eval(hash[:virtual_spec], TOPLEVEL_BINDING, "<virtual spec for '#{hash[:name]}'>")

data/Gemfile.lock

@@ -76,13 +76,13 @@ specs:
 - newgem: 
     version: 1.5.3
 - rspec-core: 
-    version: 2.0.0.beta.15
+    version: 2.0.0.beta.16
 - rspec-expectations: 
-    version: 2.0.0.beta.15
+    version: 2.0.0.beta.16
 - rspec-mocks: 
-    version: 2.0.0.beta.15
+    version: 2.0.0.beta.16
 - rspec: 
-    version: 2.0.0.beta.15
+    version: 2.0.0.beta.16
 hash: 2fa03535b60734ba6b435e984c1a4f65377fddae
 sources: 
 - Rubygems: 

data/History.txt

@@ -1,3 +1,7 @@
+== 0.13.1 2010-07-07
+
+* Can add URL .webloc files into DMG via #add_link/#link helper
+
 == 0.13.0 2010-07-06
 
 * Can now package up entire project (such as a TextMate bundle) as an item (#root or #add_root helper)

data/README.rdoc

@@ -76,6 +76,10 @@ to the end:
       s.file proc { 'README.txt' }, :position => [50, 100]
       s.file :position => [50, 100] { 'README.txt' }
       
+      # Link to external URLs
+      s.add_link 'http://github.com/drnic/choctop', 'Choctop', :position => [50, 100]
+      s.link 'http://github.com/drnic/choctop', :name => 'Choctop', :position => [50, 100]
+      
       # Even add the entire project (like a TextMate bundle)
       s.root :position => [100, 100]
       s.add_root :position => [100, 100]

data/features/dmg.feature

@@ -48,5 +48,14 @@ 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
   
+  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
+    When I invoke task "rake dmg"
+    And dmg "appcast/build/MyBundle.tmbundle.dmg" is mounted as "MyBundle.tmbundle"
+    And file "MyBundle.tmbundle" in mounted volume is created
+    And file "Applications" in mounted volume is not created
+    And webloc file "GitHub.webloc" links to "http://github.com/drnic/choctop"
+  
   
   

data/features/step_definitions/dmg_steps.rb

@@ -44,3 +44,13 @@ Then /^file "(.*)" in mounted volume (is|is not) invisible$/ do |file, is|
   end
 end
 
+When /^webloc file "([^"]*)" links to "([^"]*)"$/ do |name, url|
+  in_mounted_volume do
+    File.exists?(name).should be_true
+    
+    `cp '#{name}' /tmp/link.plist`
+    webloc_url = `defaults read /tmp/link URL`.strip
+    webloc_url.should == url
+  end
+end
+

data/features/step_definitions/generator_steps.rb

@@ -63,3 +63,8 @@ Given /^a TextMate bundle project "([^"]*)"$/ do |name|
   choctop_add_root
 end
 
+Given /^I want a link "([^"]*)" to "([^"]*)" in the DMG$/ do |name, url|
+  choctop_add_link name, url
+end
+
+

data/features/support/dmg_helpers.rb

@@ -5,10 +5,16 @@ module DmgHelper
     end
   end
   
-  def choctop_add_root(position = [347, 65])
+  def choctop_add_root(position = [180, 65])
     in_project_folder do
       append_to_file "Rakefile", "$choctop.add_root :position=> #{position.inspect}"
     end
   end
+  
+  def choctop_add_link(name, url, position = [347, 272])
+    in_project_folder do
+      append_to_file "Rakefile", "$choctop.add_link #{url.inspect}, :name => #{name.inspect}, :position=> #{position.inspect}"
+    end
+  end
 end
 World(DmgHelper)

data/lib/choctop.rb

@@ -18,7 +18,7 @@ module ChocTop
     include Dmg
     include RakeTasks
   
-    VERSION = '0.13.0'
+    VERSION = '0.13.1'
   
     attr_writer :build_opts
     def build_opts
@@ -276,6 +276,27 @@ module ChocTop
       files['.'] = options
     end
     alias_method :add_root, :root
+    
+    # Add the whole project as a mounted item; e.g. a TextMate bundle
+    # Examples:
+    #   add_link "http://github.com/drnic/choctop", :name => 'Github', :position => [50, 100]
+    #   add_link "http://github.com/drnic/choctop", 'Github.webloc', :position => [50, 100]
+    # Required option:
+    #   +:position+ - two item array [x, y] window position
+    #   +:name+    - override the name of the project when mounted in the DMG
+    def link(url, *options)
+      name = options.first if options.first.is_a?(String)
+      options = options.last || {}
+      options[:url] = url
+      options[:name] = name if name
+      throw "add_link :position => [x,y] option is missing" unless options[:position]
+      throw "add_link :name => 'Name' option is missing" unless options[:name]
+      options[:name].gsub!(/(\.webloc|\.url)$/, '')
+      options[:name] += ".webloc"
+      self.files ||= {}
+      files[options[:name]] = options
+    end
+    alias_method :add_link, :link
 
     def initialize
       $choctop = $sparkle = self # define a global variable for this object ($sparkle is legacy)
@@ -309,4 +330,4 @@ module ChocTop
       define_tasks
     end
   end
-end
+end

data/lib/choctop/dmg.rb

@@ -15,21 +15,23 @@ module ChocTop
           files[path] = options 
           options[:name] ||= File.basename(path)
         end
+        if path =~ %r{\.webloc$}
+          files[path] = options 
+          options[:name] ||= File.basename(path)
+          options[:link] = true
+        end
         files
       end
     end
 
     # Two-phase copy: first to a tmp folder (to prevent recursion); then tmp folder to +dmg_src_folder+
     def copy_files
-      require 'tmpdir'
-      tmp_dmg_src_folder = File.join(Dir.tmpdir, Time.now.to_i.to_s) # probably unique folder
       FileUtils.mkdir_p(tmp_dmg_src_folder)
       files.each do |path, options|
-        target = File.join(tmp_dmg_src_folder, options[:name])
-        sh ::Escape.shell_command(['cp', '-r', path, target])
-        if options[:exclude]
-          exclude_list = options[:exclude].is_a?(Array) ? options[:exclude] : [options[:exclude].to_s]
-          exclude_list.each { |exclude| sh ::Escape.shell_command(['rm', '-rf', File.join(target, exclude)]) }
+        if options[:link]
+          add_link_to_dmg_src_folder(path, options)
+        else
+          add_file_to_dmg_src_folder(path, options)
         end
       end
       FileUtils.rm_r(dmg_src_folder) if File.exists? dmg_src_folder
@@ -188,7 +190,25 @@ module ChocTop
     	# hdiutil flatten $@
 	
     end
+    
+    def add_file_to_dmg_src_folder(path, options)
+      target = File.join(tmp_dmg_src_folder, options[:name])
+      sh ::Escape.shell_command(['cp', '-r', path, target])
+      if options[:exclude]
+        exclude_list = options[:exclude].is_a?(Array) ? options[:exclude] : [options[:exclude].to_s]
+        exclude_list.each { |exclude| sh ::Escape.shell_command(['rm', '-rf', File.join(target, exclude)]) }
+      end
+    end
 
+    def add_link_to_dmg_src_folder(path, options)
+      plist_name   = options[:name].gsub(/\.webloc$/, '')
+      plist_target = File.join(tmp_dmg_src_folder, plist_name)
+      target       = File.join(tmp_dmg_src_folder, options[:name])
+      sh ::Escape.shell_command(['defaults', 'write', plist_target, 'URL', options[:url]])
+      sh ::Escape.shell_command(['plutil', '-convert', 'xml1', '-o', target, "#{plist_target}.plist"])
+      sh ::Escape.shell_command(['rm', "#{plist_target}.plist"])
+    end
+    
     def run_applescript(applescript, tmp_file = "choctop-script")
       File.open(scriptfile = "/tmp/#{tmp_file}", "w") do |f|
         f << applescript
@@ -202,5 +222,12 @@ module ChocTop
       end
       applescript
     end
+    
+    def tmp_dmg_src_folder
+      @tmp_dmg_src_folder ||= begin
+        require 'tmpdir'
+        File.join(Dir.tmpdir, Time.now.to_i.to_s) # probably unique folder
+      end
+    end
   end
-end
+end

data/spec/dmg_spec.rb

@@ -14,7 +14,7 @@ describe ChocTop::Dmg do
       FileUtils.chdir(@project_path) do
         @choctop.file :readme, :position=>[175, 65]
         @choctop.prepare_files
-        @choctop.files['README.txt'].should == {:position=>[175, 65]}
+        @choctop.files['README.txt'].should == {:position=>[175, 65], :name => 'README.txt'}
       end
     end
 
@@ -22,7 +22,7 @@ describe ChocTop::Dmg do
       FileUtils.chdir(@project_path) do
         @choctop.file proc { 'README.txt' }, :position=>[175, 65]
         @choctop.prepare_files
-        @choctop.files['README.txt'].should == {:position=>[175, 65]}
+        @choctop.files['README.txt'].should == {:position=>[175, 65], :name => 'README.txt'}
       end
     end
 
@@ -30,7 +30,29 @@ describe ChocTop::Dmg do
       FileUtils.chdir(@project_path) do
         @choctop.file(:position => [175, 65]) { 'README.txt' }
         @choctop.prepare_files
-        @choctop.files['README.txt'].should == {:position=>[175, 65]}
+        @choctop.files['README.txt'].should == {:position=>[175, 65], :name => 'README.txt'}
+      end
+    end
+  end
+  
+  context "#link" do
+    it "should take args: .link(url, name, :position => [x,y])" do
+      FileUtils.chdir(@project_path) do
+        @choctop.link('http://github.com', 'Fork me', :position => [175, 65])
+        @choctop.prepare_files
+        @choctop.files['Fork me.webloc'].should == {
+          :position=>[175, 65], :url => 'http://github.com', :name => 'Fork me.webloc', :link => true
+        }
+      end
+    end
+
+    it "should take args: .link(url, :name => 'Name.webloc', :position => [x,y])" do
+      FileUtils.chdir(@project_path) do
+        @choctop.link('http://github.com', :name => 'Fork me.webloc', :position => [175, 65])
+        @choctop.prepare_files
+        @choctop.files['Fork me.webloc'].should == {
+          :position=>[175, 65], :url => 'http://github.com', :name => 'Fork me.webloc', :link => true
+        }
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: choctop
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: false
   segments: 
   - 0
   - 13
-  - 0
-  version: 0.13.0
+  - 1
+  version: 0.13.1
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-06 00:00:00 +10:00
+date: 2010-07-07 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency