choctop 0.9.3 → 0.9.5

data/features/fixtures/{SampleApp/build/Release/SampleApp.app/Contents/Info.plist → App With Whitespace/Info.plist }

@@ -5,13 +5,15 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>SampleApp</string>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
 	<key>CFBundleIdentifier</key>
-	<string>com.yourcompany.SampleApp</string>
+	<string>com.yourcompany.${PRODUCT_NAME:identifier}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>SampleApp</string>
+	<string>${PRODUCT_NAME}</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleSignature</key>
@@ -22,5 +24,7 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
+	<key>SUFeedURL</key>
+	<string>http://mocra.com/some/url.xml</string>
 </dict>
 </plist>

data/features/fixtures/App With Whitespace/main.m

@@ -0,0 +1,14 @@
+//
+//  main.m
+//  App With Whitespace
+//
+//  Created by Dr Nic on 3/02/09.
+//  Copyright Mocra 2009. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+int main(int argc, char *argv[])
+{
+    return NSApplicationMain(argc,  (const char **) argv);
+}

data/features/initial_generator.feature

@@ -11,22 +11,14 @@ Feature: Setup a Cocoa app with choctop
     And output does match /rake build/
     And output does match /rake upload/
   
-  Scenario: Install choctop into an app that has an existing Rakefile
-    Given a Cocoa app that does have an existing Rakefile
-    When I run local executable 'install_choctop' with arguments '.'
-    And Rakefile wired to use development code instead of installed RubyGem
-    And output does match /choctop added to your Rakefile/
-    And output does match /rake build/
-    And output does match /rake upload/
-  
   Scenario: Run 'install_choctop' without arguments shows an error
     Given a Cocoa app that does not have an existing Rakefile
     When I run local executable 'install_choctop' with arguments ''
     Then output does match /USAGE: install_choctop path\/to\/CocoaApp/
   
-  Scenario: Install choctop and generate a ReleaseNotes file
+  Scenario: Install choctop and generate a release_notes file
     Given a Cocoa app that does not have an existing Rakefile
     When I run local executable 'install_choctop' with arguments '.'
-    Then file 'ReleaseNotes.txt' is created
-    And contents of file 'ReleaseNotes.txt' does match /Initial release/
+    Then file 'release_notes.txt' is created
+    And contents of file 'release_notes.txt' does match /Initial release/
     

data/features/rake_tasks.feature

@@ -4,17 +4,17 @@ Feature: Rake tasks are available to build and deploy Cocoa apps with Sparkle
   I want rake tasks to build and deploy my Cocoa app
 
   Scenario: rake task to build Release of app
-    Given a Cocoa app with choctop installed
+    Given a Cocoa app with choctop installed called 'SampleApp'
     When task 'rake build' is invoked
     Then folder 'build/Release/SampleApp.app' is created
 
   Scenario: rake task to create dmg file of build
-    Given a Cocoa app with choctop installed
+    Given a Cocoa app with choctop installed called 'SampleApp'
     When task 'rake dmg' is invoked
     Then file 'appcast/build/SampleApp-0.1.0.dmg' is created
 
   Scenario: rake task to upload the appcast file to the server
-    Given a Cocoa app with choctop installed
+    Given a Cocoa app with choctop installed called 'SampleApp'
     And task 'rake dmg feed' is invoked
     And ChocTop config is configured for local rsync
     When task 'rake upload' is invoked
@@ -23,7 +23,7 @@ Feature: Rake tasks are available to build and deploy Cocoa apps with Sparkle
     Then remote file 'index.php' is created
     
   Scenario: change the version number in the Info.plist
-    Given a Cocoa app with choctop installed
+    Given a Cocoa app with choctop installed called 'SampleApp'
     When task 'rake version:set VERSION="1.2.3"' is invoked 
     Then current xcode project version is '1.2.3'
   

data/features/sparkle_feed.feature

@@ -4,7 +4,7 @@ Feature: Generate an XML file for Sparkle to use for updates
   I want to generate an XML file for the Sparkle framework
   
   Scenario: rake task to create/update the appcast file
-    Given a Cocoa app with choctop installed
+    Given a Cocoa app with choctop installed called 'SampleApp'
     And ChocTop config is configured for remote Sparkle
     When task 'rake dmg feed' is invoked
     Then file 'appcast/build/my_feed.xml' is created
@@ -24,10 +24,10 @@ Feature: Generate an XML file for Sparkle to use for updates
     And contents of file 'appcast/build/release_notes.html' does match /<p>Yay! First release.</p>/
     And contents of file 'appcast/build/release_notes.html' does match /<html>/
   
-  Scenario: generate default release notes if no ReleaseNotes.txt
-    Given a Cocoa app with choctop installed
+  Scenario: generate default release notes if no release_notes.txt
+    Given a Cocoa app with choctop installed called 'SampleApp'
     And ChocTop config is configured for remote Sparkle
-    And file 'ReleaseNotes.txt' is deleted
+    And file 'release_notes.txt' is deleted
     When task 'rake dmg feed' is invoked
     Then file 'appcast/build/release_notes.html' is created
     And contents of file 'appcast/build/release_notes.html' does match /0.1.0/

data/features/steps/generator.rb

@@ -24,14 +24,15 @@ end
 Given /Rakefile constants rewired for local rsync/ do
 end
 
-Given /^a Cocoa app with choctop installed$/ do
+Given /^a Cocoa app with choctop installed called '(.*)'$/ do |name|
   Given "a safe folder"
   @remote_folder = File.expand_path(File.join(@tmp_root, 'website'))
   FileUtils.rm_rf   @remote_folder
   FileUtils.mkdir_p @remote_folder
-  `cp -r #{File.dirname(__FILE__) + "/../fixtures/SampleApp"} #{@tmp_root}/ 2> /dev/null`
-  `rm -rf #{@tmp_root}/SampleApp/build`
-  setup_active_project_folder "SampleApp"
+  app_path = File.join(File.dirname(__FILE__), "../fixtures", name)
+  `cp -r '#{app_path}' #{@tmp_root}/ 2> /dev/null`
+  `rm -rf '#{@tmp_root}/#{name}/build'`
+  setup_active_project_folder name
   Given "I run local executable 'install_choctop' with arguments '.'"
   Given "Rakefile wired to use development code instead of installed RubyGem"
   Given "Rakefile constants rewired for local rsync"

data/lib/choctop/appcast.rb

@@ -54,8 +54,8 @@ module ChocTop::Appcast
   end
   
   def release_notes_content
-    if File.exists?("ReleaseNotes.txt")
-      File.read("ReleaseNotes.txt")
+    if File.exists?("release_notes.txt")
+      File.read("release_notes.txt")
     else
       <<-TEXTILE.gsub(/^      /, '')
       h1. #{version} #{Date.today}

data/lib/choctop/dmg.rb

@@ -5,17 +5,17 @@ module ChocTop::Dmg
     FileUtils.mkdir_p mountpoint # TODO can we remove random mountpoints?
     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 "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}"
+      sh "SetFile -a C '#{volume_path}'"
     end
     target_background = "#{volume_path}/#{volume_background}"
     FileUtils.cp(background_file, target_background) if background_file
     configure_dmg_window
-    sh "SetFile -a V #{target_background}" if background_file
+    sh "SetFile -a V '#{target_background}'" if background_file
   end
   
   def volume_background

data/lib/choctop.rb

@@ -10,10 +10,10 @@ require "active_support"
 require "RedCloth"
 
 class ChocTop
-  VERSION = '0.9.3'
+  VERSION = '0.9.5'
   
   # The name of the Cocoa application
-  # Default: info_plist['CFBundleExecutable'] or project folder name if "${EXECUTABLE}"
+  # Default: info_plist['CFBundleExecutable'] or project folder name if "${EXECUTABLE_NAME}"
   attr_accessor :name
   
   # The version of the Cocoa application
@@ -38,7 +38,7 @@ class ChocTop
   # Default: release_notes.html
   attr_accessor :release_notes
 
-  # The path for an HTML template into which the ReleaseNotes.txt are inserted
+  # The path for an HTML template into which the release_notes.txt are inserted
   # after conversion to HTML
   #
   # The template file is an ERb template, with <%= yield %> as the placeholder
@@ -131,7 +131,7 @@ class ChocTop
     
     # Defaults
     @name = info_plist['CFBundleExecutable']
-    @name = File.basename(File.expand_path(".")) if name == "${EXECUTABLE}"
+    @name = File.basename(File.expand_path(".")) if name == "${EXECUTABLE_NAME}"
     @version = info_plist['CFBundleVersion']
     @target = "#{name}.app"
     @appcast_filename = info_plist['SUFeedURL'] ? File.basename(info_plist['SUFeedURL']) : 'linker_appcast.xml'

data/website/_layouts/default.html

@@ -0,0 +1,41 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width = 750">
+    <link rel="stylesheet" type="text/css" href="css/stylesheet.css" charset="utf-8">
+    <title>{{ page.title }}</title>
+  </head>
+  <body id="intro">
+    <div id="wrapper">
+      <img src="images/title-slide.png" id="logo"/>
+      <div id="header" onclick="javascript:window.location='/choctop/'">
+      </div>
+      <div id="navigation">
+        <ul>
+          <li id="navi_intro">
+            <a href="/choctop/">Intro</a>
+          </li>
+          <li id="navi_source">
+            <a href="http://github.com/drnic/choctop">Source</a>
+          </li>
+          <li id="navi_tickets">
+            <a href="http://drnic.lighthouseapp.com/projects/24673-choctop/tickets">Tickets</a>
+          </li>
+          <li id="navi_twitter">
+            <a href="http://search.twitter.com/search?q=choctop">"I <span class="love">♥</span> ChocTop" on Twitter</a>
+          </li>
+        </ul>
+      </div>
+      <div id="page_body">
+        <div id="content">
+          {{ content }}
+        </div>
+      </div>
+      <div id="footer">
+        <p>made by <a href="http://drnicwilliams.com">Dr Nic</a> | sponsored by <a href="http://mocra.com">Mocra</a> | thank you to all contributors!</p>
+      </div>
+    </div>
+  </body>
+</html>

data/website/_layouts/post.html

@@ -0,0 +1,86 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width = 750">
+    <link rel="stylesheet" type="text/css" href="../../../css/stylesheet.css" charset="utf-8">
+    <title>{{ page.title }}</title>
+  </head>
+  <body id="intro">
+    <div id="wrapper">
+      <div id="header" onclick="javascript:window.location='/choctop/'">
+        <h1>ChocTop</h1>
+      </div>
+      <div id="navigation">
+        <ul>
+          <li id="navi_intro">
+            <a href="/choctop/">Intro</a>
+          </li>
+          <li id="navi_source">
+            <a href="http://github.com/drnic/choctop">Source</a>
+          </li>
+          <li id="navi_tickets">
+            <a href="http://drnic.lighthouseapp.com/projects/http://drnic.lighthouseapp.com/projects/24673-choctop/overview/tickets">Tickets</a>
+          </li>
+        </ul>
+      </div>
+      <div id="page_body">
+        <div id="content">
+          {{ content }}
+                    
+          <script type="text/javascript">var disqus_url = "http://drnic.github.com/choctop/{{ post.url }}"; var disqus_title ="{{ post.title }}";</script>
+          <div id="disqus_thread"></div><script type="text/javascript" src="http://disqus.com/forums/choctop/embed.js"></script>
+          <a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
+          <script type="text/javascript">
+          //<![CDATA[
+          (function() {
+          		var links = document.getElementsByTagName('a');
+          		var query = '?';
+          		for(var i = 0; i < links.length; i++) {
+          			if(links[i].href.indexOf('#disqus_thread') >= 0) {
+          				query += 'url' + i + '=' + encodeURIComponent(links[i].href) + '&';
+          			}
+          		}
+          		document.write('<script type="text/javascript" src="http://disqus.com/forums/choctop/get_num_replies.js' + query + '"></' + 'script>');
+          	})();
+          //]]>
+          </script>
+          
+        </div>
+        <div id="sidebar">
+          <div class="item">
+            <!-- Download    -->
+            <h4>Install Bundle</h4>
+            <p>Coming soon</p>
+          </div>
+          <div class="item">
+            <!-- Tickets   -->
+            <h4><a href="http://drnic.lighthouseapp.com/projects/http://drnic.lighthouseapp.com/projects/24673-choctop/overview/tickets" id="tickets" name="tickets">Tickets</a></h4>
+            <p>
+              Found a bug?<br />
+              Request a feature?
+            </p>
+          </div>
+          <div class="item">
+            <!-- Blog   -->
+            <a href="../../../atom.xml" id="rss_feed" name="rss_feed">Blog Posts</a>
+            <h4>Blog Posts</h4>
+            <p>
+              {% for post in site.posts %} 
+                <span>{{ post.date | date_to_string }}</span> » <a href="{{ post.url }}">{{ post.title }}</a><br>
+              {% endfor %}
+            </p>
+          </div>
+          <div class="item">
+            <script type="text/javascript" src="http://disqus.com/forums/choctop/combination_widget.js?num_items=5&color=orange&default_tab=recent"></script>
+          </div>
+        </div>
+      </div>
+      <div id="footer">
+        <p>made by <a href="http://drnicwilliams.com">Dr Nic</a> | sponsored by <a href="http://mocra.com">Mocra</a> | thank you to all contributors!</p>
+      </div>
+    </div>
+    <a href="http://github.com/drnic/choctop"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /></a>
+  </body>
+</html>

data/website/_posts/2009-02-02-first-post.markdown

@@ -0,0 +1,6 @@
+---
+layout: post
+title: Welcome to 'ChocTop'
+---
+
+ChocTop is going to be an awesome project.

data/website/_site/2009/02/02/first-post.html

@@ -0,0 +1,86 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width = 750">
+    <link rel="stylesheet" type="text/css" href="../../../css/stylesheet.css" charset="utf-8">
+    <title>Welcome to 'ChocTop'</title>
+  </head>
+  <body id="intro">
+    <div id="wrapper">
+      <div id="header" onclick="javascript:window.location='/choctop/'">
+        <h1>ChocTop</h1>
+      </div>
+      <div id="navigation">
+        <ul>
+          <li id="navi_intro">
+            <a href="/choctop/">Intro</a>
+          </li>
+          <li id="navi_source">
+            <a href="http://github.com/drnic/choctop">Source</a>
+          </li>
+          <li id="navi_tickets">
+            <a href="http://drnic.lighthouseapp.com/projects/http://drnic.lighthouseapp.com/projects/24673-choctop/overview/tickets">Tickets</a>
+          </li>
+        </ul>
+      </div>
+      <div id="page_body">
+        <div id="content">
+          <p>ChocTop is going to be an awesome project.</p>
+                    
+          <script type="text/javascript">var disqus_url = "http://drnic.github.com/choctop/"; var disqus_title ="";</script>
+          <div id="disqus_thread"></div><script type="text/javascript" src="http://disqus.com/forums/choctop/embed.js"></script>
+          <a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
+          <script type="text/javascript">
+          //<![CDATA[
+          (function() {
+          		var links = document.getElementsByTagName('a');
+          		var query = '?';
+          		for(var i = 0; i < links.length; i++) {
+          			if(links[i].href.indexOf('#disqus_thread') >= 0) {
+          				query += 'url' + i + '=' + encodeURIComponent(links[i].href) + '&';
+          			}
+          		}
+          		document.write('<script type="text/javascript" src="http://disqus.com/forums/choctop/get_num_replies.js' + query + '"></' + 'script>');
+          	})();
+          //]]>
+          </script>
+          
+        </div>
+        <div id="sidebar">
+          <div class="item">
+            <!-- Download    -->
+            <h4>Install Bundle</h4>
+            <p>Coming soon</p>
+          </div>
+          <div class="item">
+            <!-- Tickets   -->
+            <h4><a href="http://drnic.lighthouseapp.com/projects/http://drnic.lighthouseapp.com/projects/24673-choctop/overview/tickets" id="tickets" name="tickets">Tickets</a></h4>
+            <p>
+              Found a bug?<br />
+              Request a feature?
+            </p>
+          </div>
+          <div class="item">
+            <!-- Blog   -->
+            <a href="../../../atom.xml" id="rss_feed" name="rss_feed">Blog Posts</a>
+            <h4>Blog Posts</h4>
+            <p>
+               
+                <span>02 Feb 2009</span> » <a href="/2009/02/02/first-post.html">Welcome to 'ChocTop'</a><br>
+              
+            </p>
+          </div>
+          <div class="item">
+            <script type="text/javascript" src="http://disqus.com/forums/choctop/combination_widget.js?num_items=5&color=orange&default_tab=recent"></script>
+          </div>
+        </div>
+      </div>
+      <div id="footer">
+        <p>made by <a href="http://drnicwilliams.com">Dr Nic</a> | sponsored by <a href="http://mocra.com">Mocra</a> | thank you to all contributors!</p>
+      </div>
+    </div>
+    <a href="http://github.com/drnic/choctop"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /></a>
+  </body>
+</html>

data/website/_site/atom.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+ 
+ <title>ChocTop</title>
+ <link href="http://drnic.github.com/choctop/atom.xml" rel="self"/>
+ <link href="http://drnic.github.com/choctop/"/>
+ <updated>2009-02-03T09:56:03+10:00</updated>
+ <id>http://drnic.github.com/choctop/</id>
+ <author>
+   <name>Dr Nic Williams</name>
+   <email>drnicwilliams@gmail.com</email>
+ </author>
+
+ 
+ <entry>
+   <title>Welcome to 'ChocTop'</title>
+   <link href="http://drnic.github.com/choctop/2009/02/02/first-post.html"/>
+   <updated>2009-02-02T00:00:00+10:00</updated>
+   <id>http://drnic.github.com/choctop/2009/02/02/first-post</id>
+   <content type="html">&lt;p&gt;ChocTop is going to be an awesome project.&lt;/p&gt;</content>
+ </entry>
+ 
+ 
+</feed>

data/website/_site/config.yml

@@ -0,0 +1,6 @@
+--- 
+:github_user: drnic
+:header_color: aaa
+:name: choctop
+:theme: plain
+:title: ChocTop

data/website/_site/css/stylesheet.css

@@ -0,0 +1,135 @@
+html {
+	background: #1e1e1e;
+}
+body {
+/*  background: transparent url("http://macromates.com/images/site/bg_body") repeat-y 50% 0px;*/
+/* font: 0.72em/170% "Lucida Grande", Verdana, Helvetica, sans-serif;*/
+	font: 12px "Lucida Grande", Verdana, Helvetica, sans-serif;
+	margin: 0;
+	padding: 0;
+	background-image: url(../images/mocra-keynote-bg.jpg);
+}
+a[href] {
+	color: #525151;
+}
+
+#wrapper { /* IE workaround */
+	margin: 0 auto;
+	padding: 0;
+	width: 550px;
+}
+html>body #wrapper {
+	margin: 0 auto;
+	padding: 0;
+	width: auto;
+	max-width: 550px;
+}
+
+#logo {
+  padding-top: 10px;
+  text-align: center;
+}
+#header {
+	position: relative;
+}
+#header h1 {
+	position: absolute;
+	left: 60px;
+	top: 40px;
+	height: 50px;
+	cursor: pointer;
+	color: white;
+}
+
+#navigation {
+	background: #232323;
+	border-bottom: 1px solid #171717;
+	margin: 0;
+	padding: 0.5em 0;
+	width: 100%;
+}
+#navigation ul {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+#navigation li {
+	display: inline;
+	margin: 0;
+	padding: 0 0 0 25px;
+	text-shadow: 0px 2px 4px #000;
+}
+#navigation li a {
+	color: #5b5b5b;
+	text-decoration: none;
+}
+
+#intro		#navi_intro			a,
+#blog			#navi_blog			a,
+#toc			#navi_manual		a,
+#chapter		#navi_manual		a,
+#wiki			#navi_wiki			a,
+#community	#navi_community	a,
+#contact		#navi_contact		a,
+#navigation li a:hover {
+	color: #fff;
+}
+
+#page_body {
+	margin: 0;
+	padding: 0;
+	position: relative;
+	overflow: hidden;
+}
+
+#content { /* IE workaround */
+	margin: 0;
+	padding: 25px;
+	width: 100%;
+	height: 584px; /* (64+2*20+2)*6 - 2 - 2*25 */
+	background: #D6C086;
+}
+html>body #content {
+	margin: 0;
+	padding: 25px;
+	width: auto;
+	height: auto;
+	min-height: 584px; /* (64+2*20+2)*6 - 2 - 2*25 */
+	background: #D6C086;
+}
+#content :first-child {
+	margin-top: 0px;
+}
+#content :first-child + h1 {
+	margin-top: 0px;
+}
+
+#footer {
+	position: relative;
+	margin: 0;
+	padding: 0.75em 25px 0.75em 25px;
+	min-height: 1em;
+	clear: both;
+	color: #b5b5b5;
+	background: #2E2E2E;
+}
+#footer * {
+	margin: 0;
+	padding: 0;
+}
+#footer a {
+	color: #b5b5b5;
+	text-decoration: none;
+}
+#footer a:hover {
+	color: #2E2E2E;
+	background: #b5b5b5;
+	text-decoration: none;
+}
+#footer .left {
+	float: left;
+}
+#footer .right {
+	float: right;
+}
+