choctop 0.12.1 → 0.13.0

data/lib/choctop/appcast.rb

@@ -1,7 +1,7 @@
 module ChocTop
   module Appcast
     def make_build
-      if skip_build
+      if skip_xcode_build
         puts "Skipping build task..."
       else
         sh "xcodebuild -configuration #{build_type} -target #{build_target} #{build_opts}"
@@ -56,9 +56,8 @@ module ChocTop
       end
     end
 
-    def skip_build
+    def skip_xcode_build
       return true if ENV['NO_BUILD']
-      return false if File.exists?('Info.plist')
       return false if Dir['*.xcodeproj'].size > 0
       true
     end

data/lib/choctop/dmg.rb

@@ -11,17 +11,30 @@ module ChocTop
           else
             path_or_helper
         end
-        files[path] = options if path && File.exists?(path) && File.basename(path) != '.'
+        if path && File.exists?(path)
+          files[path] = options 
+          options[:name] ||= File.basename(path)
+        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
-      FileUtils.rm_r(src_folder) if File.exists? src_folder
-      FileUtils.mkdir_p(src_folder)
+      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|
-        FileUtils.cp_r(path, src_folder)
+        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
+      FileUtils.rm_r(dmg_src_folder) if File.exists? dmg_src_folder
+      FileUtils.mkdir_p(dmg_src_folder)
+      Dir["#{tmp_dmg_src_folder}/*"].each { |f| FileUtils.cp_r(f, dmg_src_folder) }
     end
 
     def make_dmg
@@ -30,7 +43,7 @@ module ChocTop
       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 create -format UDRW -quiet -volname '#{name}' -srcfolder '#{dmg_src_folder}' '#{pkg}'"
       sh "hdiutil attach '#{pkg}' -mountpoint '#{volume_path}' -noautoopen -quiet"
       sh "bless --folder '#{volume_path}' --openfolder '#{volume_path}'"
       sh "sleep 1"
@@ -115,7 +128,7 @@ module ChocTop
     def set_position_of_files
       files.map do |file_options|
         path, options = file_options
-        target        = File.basename(path)
+        target        = options[:name]
         position      = options[:position].join(", ")
         %Q{set position of item "#{target}" to {#{position}}}
       end.join("\n")

data/lib/choctop/rake_tasks.rb

@@ -9,6 +9,10 @@ module ChocTop
       task "build/#{build_type}/#{target}/Contents/Info.plist" do
         make_build
       end
+      
+      task :clean_build do
+        FileUtils.rm_rf(build_path)
+      end
 
       desc "Create the dmg file for appcasting"
       task :dmg => :build do

data/spec/dmg_spec.rb

@@ -0,0 +1,37 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe ChocTop::Dmg do
+  before(:each) do
+    @project_path = File.dirname(__FILE__) + "/../features/fixtures/SampleApp"
+    FileUtils.chdir(@project_path) do
+      @choctop = ChocTop::Configuration.new
+      @choctop.files = {}
+    end
+  end
+
+  context "#prepare_files" do
+    it "should process :target_bundle into a path" do
+      FileUtils.chdir(@project_path) do
+        @choctop.file :readme, :position=>[175, 65]
+        @choctop.prepare_files
+        @choctop.files['README.txt'].should == {:position=>[175, 65]}
+      end
+    end
+
+    it "should process procs into a path" 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]}
+      end
+    end
+
+    it "should process blocks into a path" do
+      FileUtils.chdir(@project_path) do
+        @choctop.file(:position => [175, 65]) { 'README.txt' }
+        @choctop.prepare_files
+        @choctop.files['README.txt'].should == {:position=>[175, 65]}
+      end
+    end
+  end
+end

data/spec/fixtures/Info.plist

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>SampleApp</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>com.yourcompany.${PRODUCT_NAME:identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>SUFeedURL</key>
+	<string>http://mocra.com/sample_app/my_feed.xml</string>
+</dict>
+</plist>

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
-require 'rubygems'
-require 'spec'
+require "bundler"
+Bundler.setup
+Bundler.require :spec
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'choctop'

data/spec/version_helper_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe ChocTop::VersionHelper do
+  before(:each) do
+    @version_helper = ChocTop::VersionHelper.new(File.expand_path("spec/fixtures/Info.plist"))
+  end
+  
+  it "should handle Xcodes default format d.d" do
+    @version_helper.to_s.should == "1.0.0"
+  end
+  
+  it "should bump major" do
+    @version_helper.bump_major
+    @version_helper.to_s.should == "2.0.0"
+  end
+  
+  it "should bump minor" do
+    @version_helper.bump_minor
+    @version_helper.to_s.should == "1.1.0"
+  end
+  
+  it "should bump patch" do
+    @version_helper.bump_patch
+    @version_helper.to_s.should == "1.0.1"
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: choctop
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: false
   segments: 
   - 0
-  - 12
-  - 1
-  version: 0.12.1
+  - 13
+  - 0
+  version: 0.13.0
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -17,73 +17,119 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 +02:00
+date: 2010-07-06 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: builder
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 7
         segments: 
         - 2
-        - 1
-        - 2
-        version: 2.1.2
-  type: :runtime
+        - 0
+        - 4
+        version: 2.0.4
+  type: :development
+  prerelease: false
+  name: rubyforge
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 21
         segments: 
         - 2
-        - 0
-        - 4
-        version: 2.0.4
+        - 6
+        - 1
+        version: 2.6.1
   type: :development
+  prerelease: false
+  name: hoe
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: newgem
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 23
         segments: 
-        - 1
-        - 5
-        - 3
-        version: 1.5.3
-  type: :development
+        - 0
+        - 0
+        - 4
+        version: 0.0.4
+  type: :runtime
+  prerelease: false
+  name: escape
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: hoe
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
+        - 0
         - 2
-        - 6
+        - 1
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  name: awesome_print
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
         - 0
-        version: 2.6.0
+        version: "0"
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  name: bundler
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 4
+        - 2
+        - 3
+        version: 4.2.3
+  type: :runtime
+  prerelease: false
+  name: RedCloth
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 1
+        - 2
+        version: 2.1.2
+  type: :runtime
+  prerelease: false
+  name: builder
+  version_requirements: *id007
 description: "Build and deploy tools for Cocoa apps using Sparkle for distributions and upgrades; \n\
   it\xE2\x80\x99s like Hoe but for Cocoa apps.\n\n\
   Package up your OS X/Cocoa applications into Custom DMGs, generate Sparkle XML, and\n\
@@ -105,7 +151,13 @@ extensions: []
 extra_rdoc_files: 
 - History.txt
 - Manifest.txt
+- features/fixtures/SampleApp/README.txt
 files: 
+- .bundle/config
+- .bundle/environment.rb
+- .rspec
+- Gemfile
+- Gemfile.lock
 - History.txt
 - Manifest.txt
 - README.rdoc
@@ -120,8 +172,26 @@ files:
 - assets/vanillia_dmg_icon.png
 - assets/wood.jpg
 - bin/install_choctop
+- choctop.gemspec
 - features/development.feature
 - features/dmg.feature
+- features/fixtures/App With Whitespace/App With Whitespace.xcodeproj/TemplateIcon.icns
+- features/fixtures/App With Whitespace/App With Whitespace.xcodeproj/project.pbxproj
+- features/fixtures/App With Whitespace/App With Whitespace_Prefix.pch
+- features/fixtures/App With Whitespace/English.lproj/InfoPlist.strings
+- features/fixtures/App With Whitespace/English.lproj/MainMenu.xib
+- features/fixtures/App With Whitespace/Info.plist
+- features/fixtures/App With Whitespace/main.m
+- features/fixtures/MyBundle.tmbundle/Snippets/hello world.tmSnippet
+- features/fixtures/MyBundle.tmbundle/info.plist
+- features/fixtures/SampleApp/English.lproj/InfoPlist.strings
+- features/fixtures/SampleApp/English.lproj/MainMenu.xib
+- features/fixtures/SampleApp/Info.plist
+- features/fixtures/SampleApp/README.txt
+- 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/custom_assets/appicon.icns
 - features/initial_generator.feature
 - features/rake_tasks.feature
@@ -133,6 +203,7 @@ files:
 - features/step_definitions/remote_steps.rb
 - features/step_definitions/xcode_steps.rb
 - features/support/common.rb
+- features/support/dmg_helpers.rb
 - features/support/env.rb
 - features/support/matchers.rb
 - lib/choctop.rb
@@ -144,9 +215,10 @@ files:
 - script/destroy
 - script/generate
 - spec/choctop_spec.rb
-- spec/spec.opts
+- spec/dmg_spec.rb
+- spec/fixtures/Info.plist
 - spec/spec_helper.rb
-- tasks/rspec.rake
+- spec/version_helper_spec.rb
 has_rdoc: true
 homepage: http://drnic.github.com/choctop
 licenses: []

data/tasks/rspec.rake

@@ -1,21 +0,0 @@
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems'
-  require 'spec'
-end
-begin
-  require 'spec/rake/spectask'
-rescue LoadError
-  puts <<-EOS
-To use rspec for testing you must install rspec gem:
-    gem install rspec
-EOS
-  exit(0)
-end
-
-desc "Run the specs under spec/models"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end