From 211dfacb5087c2baa750178d3f701b5d0bdd7a30 Mon Sep 17 00:00:00 2001
From: Frederic Jean <fred@fredjean.net>
Date: Tue, 8 Jan 2013 15:13:34 -0700
Subject: [PATCH 01/20] Adjusting path to icon

Adjusting path to icon to reflect the metadata.
---
 lib/beta_builder/archived_build.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/beta_builder/archived_build.rb b/lib/beta_builder/archived_build.rb
index d9639e0..0971d49 100644
--- a/lib/beta_builder/archived_build.rb
+++ b/lib/beta_builder/archived_build.rb
@@ -76,7 +76,7 @@ def write_plist_to(path)
           "ApplicationPath"             => File.join("Applications", @configuration.app_file_name),
           "CFBundleIdentifier"          => metadata["CFBundleIdentifier"], 
           "CFBundleShortVersionString"  => version, 
-          "IconPaths"                   => metadata["CFBundleIconFiles"].map { |file| File.join("Applications", @configuration.app_file_name, file) }
+          "IconPaths"                   => metadata["CFBundleIcons"]["CFBundlePrimaryIcon"]["CFBundleIconFiles"].map { |file| File.join("Applications", @configuration.app_file_name, file) }
         }, 
         "ArchiveVersion" => 1.0, 
         "Comment"        => @configuration.release_notes_text,

From 07b022dcb835397f492673e7be1e7d1f29ee951d Mon Sep 17 00:00:00 2001
From: Frederic Jean <fred@fredjean.net>
Date: Tue, 8 Jan 2013 15:29:12 -0700
Subject: [PATCH 02/20] Using FileUtils.rm_rf

---
 lib/beta_builder/deployment_strategies/testflight.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/beta_builder/deployment_strategies/testflight.rb b/lib/beta_builder/deployment_strategies/testflight.rb
index 41250aa..359a2c0 100644
--- a/lib/beta_builder/deployment_strategies/testflight.rb
+++ b/lib/beta_builder/deployment_strategies/testflight.rb
@@ -67,7 +67,7 @@ def get_notes_using_editor
           system("#{editor} #{filepath}")
           @configuration.release_notes = File.read(filepath)
         ensure
-          rm_rf(dir)
+          FileUtils.rm_rf(dir)
         end
       end
       

From 8f46cb18d9bcb80240b47054dba8a4a83d0a7418 Mon Sep 17 00:00:00 2001
From: Miles Matthias <miles.matthias@gmail.com>
Date: Wed, 21 Aug 2013 13:47:24 -0600
Subject: [PATCH 03/20] Add more logging to the Testflight upload response.

---
 lib/beta_builder/deployment_strategies/testflight.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/beta_builder/deployment_strategies/testflight.rb b/lib/beta_builder/deployment_strategies/testflight.rb
index 359a2c0..fc6598c 100644
--- a/lib/beta_builder/deployment_strategies/testflight.rb
+++ b/lib/beta_builder/deployment_strategies/testflight.rb
@@ -40,6 +40,7 @@ def deploy
         
         begin
           response = RestClient.post(ENDPOINT, payload, :accept => :json)
+          puts "response = ", response
         rescue => e
           response = e.response
         end

From aaf76ea46c420eae6bbbe957330eb1fa02f1b223 Mon Sep 17 00:00:00 2001
From: Miles Matthias <miles.matthias@gmail.com>
Date: Wed, 21 Aug 2013 16:27:57 -0600
Subject: [PATCH 04/20] Added some more logging to betabuilder testflight
 uploads.

---
 lib/beta_builder/deployment_strategies/testflight.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/beta_builder/deployment_strategies/testflight.rb b/lib/beta_builder/deployment_strategies/testflight.rb
index fc6598c..34d7247 100644
--- a/lib/beta_builder/deployment_strategies/testflight.rb
+++ b/lib/beta_builder/deployment_strategies/testflight.rb
@@ -28,6 +28,7 @@ def deploy
           :replace            => @configuration.replace || false
         }
         puts "Uploading build to TestFlight..."
+        puts "payload = ", payload
         if @configuration.verbose
           puts "ipa path: #{@configuration.ipa_path}"
           puts "release notes: #{release_notes}"

From 3780927e53d9b143fe8ecad3099c3a55b5507b7c Mon Sep 17 00:00:00 2001
From: Miles Matthias <miles.matthias@gmail.com>
Date: Wed, 21 Aug 2013 16:30:19 -0600
Subject: [PATCH 05/20] Incremented version number.

---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index 16ec69d..77aa8c7 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "betabuilder"
-  s.version           = "0.7.4.1"
+  s.version           = "0.7.4.2"
   s.summary           = "A set of Rake tasks and utilities for managing iOS ad-hoc builds"
   s.author            = "Luke Redpath"
   s.email             = "luke@lukeredpath.co.uk"

From 854ccf138c8d8c460a4d3b753deb1516fa1e50b9 Mon Sep 17 00:00:00 2001
From: Miles Matthias <miles.matthias@gmail.com>
Date: Wed, 21 Aug 2013 16:32:07 -0600
Subject: [PATCH 06/20] Updated the gemspec file.

---
 betabuilder.gemspec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/betabuilder.gemspec b/betabuilder.gemspec
index 3a37189..9ea81e3 100644
--- a/betabuilder.gemspec
+++ b/betabuilder.gemspec
@@ -2,18 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name = "betabuilder"
-  s.version = "0.7.4.1"
+  s.version = "0.7.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Luke Redpath"]
-  s.date = "2012-05-16"
+  s.date = "2013-08-21"
   s.email = "luke@lukeredpath.co.uk"
   s.extra_rdoc_files = ["README.md", "LICENSE", "CHANGES.md"]
   s.files = ["CHANGES.md", "LICENSE", "README.md", "lib/beta_builder", "lib/beta_builder/archived_build.rb", "lib/beta_builder/build_output_parser.rb", "lib/beta_builder/deployment_strategies", "lib/beta_builder/deployment_strategies/testflight.rb", "lib/beta_builder/deployment_strategies/web.rb", "lib/beta_builder/deployment_strategies.rb", "lib/beta_builder.rb", "lib/betabuilder.rb"]
   s.homepage = "http://github.com/lukeredpath/betabuilder"
   s.rdoc_options = ["--main", "README.md"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.23"
   s.summary = "A set of Rake tasks and utilities for managing iOS ad-hoc builds"
 
   if s.respond_to? :specification_version then

From ec14a48a2c84d318b6a4cff5d18626b1cb26dea2 Mon Sep 17 00:00:00 2001
From: Miles Matthias <miles.matthias@gmail.com>
Date: Wed, 21 Aug 2013 17:08:36 -0600
Subject: [PATCH 07/20] Only show payload if verbose.

---
 lib/beta_builder/deployment_strategies/testflight.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/beta_builder/deployment_strategies/testflight.rb b/lib/beta_builder/deployment_strategies/testflight.rb
index 34d7247..a41f241 100644
--- a/lib/beta_builder/deployment_strategies/testflight.rb
+++ b/lib/beta_builder/deployment_strategies/testflight.rb
@@ -28,10 +28,10 @@ def deploy
           :replace            => @configuration.replace || false
         }
         puts "Uploading build to TestFlight..."
-        puts "payload = ", payload
         if @configuration.verbose
           puts "ipa path: #{@configuration.ipa_path}"
           puts "release notes: #{release_notes}"
+          puts "payload = ", payload
         end
         
         if @configuration.dry_run 

From b555bca51ae37556537872c924067584c751cc07 Mon Sep 17 00:00:00 2001
From: Miles Matthias <miles.matthias@gmail.com>
Date: Wed, 21 Aug 2013 17:54:50 -0600
Subject: [PATCH 08/20] Incremented version, which just rolled back zip stuff.

---
 Rakefile            | 2 +-
 betabuilder.gemspec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Rakefile b/Rakefile
index 77aa8c7..b7547dc 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "betabuilder"
-  s.version           = "0.7.4.2"
+  s.version           = "0.7.4.6"
   s.summary           = "A set of Rake tasks and utilities for managing iOS ad-hoc builds"
   s.author            = "Luke Redpath"
   s.email             = "luke@lukeredpath.co.uk"
diff --git a/betabuilder.gemspec b/betabuilder.gemspec
index 9ea81e3..6335109 100644
--- a/betabuilder.gemspec
+++ b/betabuilder.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "betabuilder"
-  s.version = "0.7.4.2"
+  s.version = "0.7.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Luke Redpath"]

From 7d4b9efa204acf228fcc31c9b06ef3644fe3f2e1 Mon Sep 17 00:00:00 2001
From: Miles Matthias <miles.matthias@gmail.com>
Date: Thu, 22 Aug 2013 08:20:21 -0600
Subject: [PATCH 09/20] Always zip the dSYM and include the path in the config.

---
 Rakefile            | 2 +-
 betabuilder.gemspec | 4 ++--
 lib/beta_builder.rb | 6 ++++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Rakefile b/Rakefile
index b7547dc..8dd1a21 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "betabuilder"
-  s.version           = "0.7.4.6"
+  s.version           = "0.7.4.7"
   s.summary           = "A set of Rake tasks and utilities for managing iOS ad-hoc builds"
   s.author            = "Luke Redpath"
   s.email             = "luke@lukeredpath.co.uk"
diff --git a/betabuilder.gemspec b/betabuilder.gemspec
index 6335109..fbe9fdd 100644
--- a/betabuilder.gemspec
+++ b/betabuilder.gemspec
@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "betabuilder"
-  s.version = "0.7.4.6"
+  s.version = "0.7.4.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Luke Redpath"]
-  s.date = "2013-08-21"
+  s.date = "2013-08-22"
   s.email = "luke@lukeredpath.co.uk"
   s.extra_rdoc_files = ["README.md", "LICENSE", "CHANGES.md"]
   s.files = ["CHANGES.md", "LICENSE", "README.md", "lib/beta_builder", "lib/beta_builder/archived_build.rb", "lib/beta_builder/build_output_parser.rb", "lib/beta_builder/deployment_strategies", "lib/beta_builder/deployment_strategies/testflight.rb", "lib/beta_builder/deployment_strategies/web.rb", "lib/beta_builder/deployment_strategies.rb", "lib/beta_builder.rb", "lib/betabuilder.rb"]
diff --git a/lib/beta_builder.rb b/lib/beta_builder.rb
index 878a6a7..83ce763 100644
--- a/lib/beta_builder.rb
+++ b/lib/beta_builder.rb
@@ -92,6 +92,12 @@ def derived_build_dir_from_build_output
       def built_app_dsym_path
         "#{built_app_path}.dSYM"
       end
+
+      def built_app_zipped_dsym_path
+        zip_path = "#{built_app_path}.dSYM.zip"
+        sh "zip -r #{zip_path} #{built_app_dsym_path}"
+        zip_path
+      end
       
       def dist_path
         File.join("pkg/dist")

From 633db5545c0675e9a51db96d29e2b1c2227f95da Mon Sep 17 00:00:00 2001
From: Miles Matthias <miles.matthias@gmail.com>
Date: Thu, 22 Aug 2013 08:25:18 -0600
Subject: [PATCH 10/20] Use system instead of sh.

---
 Rakefile            | 2 +-
 betabuilder.gemspec | 2 +-
 lib/beta_builder.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Rakefile b/Rakefile
index 8dd1a21..feec369 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "betabuilder"
-  s.version           = "0.7.4.7"
+  s.version           = "0.7.4.8"
   s.summary           = "A set of Rake tasks and utilities for managing iOS ad-hoc builds"
   s.author            = "Luke Redpath"
   s.email             = "luke@lukeredpath.co.uk"
diff --git a/betabuilder.gemspec b/betabuilder.gemspec
index fbe9fdd..a53b94d 100644
--- a/betabuilder.gemspec
+++ b/betabuilder.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "betabuilder"
-  s.version = "0.7.4.7"
+  s.version = "0.7.4.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Luke Redpath"]
diff --git a/lib/beta_builder.rb b/lib/beta_builder.rb
index 83ce763..dbcc565 100644
--- a/lib/beta_builder.rb
+++ b/lib/beta_builder.rb
@@ -95,7 +95,7 @@ def built_app_dsym_path
 
       def built_app_zipped_dsym_path
         zip_path = "#{built_app_path}.dSYM.zip"
-        sh "zip -r #{zip_path} #{built_app_dsym_path}"
+        system("zip -r #{zip_path} #{built_app_dsym_path}")
         zip_path
       end
       

From 7a8bf86426c9ea920722cccc981e83d06f3e5ba1 Mon Sep 17 00:00:00 2001
From: Miles Matthias <miles.matthias@gmail.com>
Date: Thu, 22 Aug 2013 08:29:09 -0600
Subject: [PATCH 11/20] Include the zipped dsym in the testflight payload.

---
 Rakefile                                             | 2 +-
 betabuilder.gemspec                                  | 2 +-
 lib/beta_builder/deployment_strategies/testflight.rb | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Rakefile b/Rakefile
index feec369..75f7d97 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "betabuilder"
-  s.version           = "0.7.4.8"
+  s.version           = "0.7.4.9"
   s.summary           = "A set of Rake tasks and utilities for managing iOS ad-hoc builds"
   s.author            = "Luke Redpath"
   s.email             = "luke@lukeredpath.co.uk"
diff --git a/betabuilder.gemspec b/betabuilder.gemspec
index a53b94d..b02208e 100644
--- a/betabuilder.gemspec
+++ b/betabuilder.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "betabuilder"
-  s.version = "0.7.4.8"
+  s.version = "0.7.4.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Luke Redpath"]
diff --git a/lib/beta_builder/deployment_strategies/testflight.rb b/lib/beta_builder/deployment_strategies/testflight.rb
index a41f241..d7140f1 100644
--- a/lib/beta_builder/deployment_strategies/testflight.rb
+++ b/lib/beta_builder/deployment_strategies/testflight.rb
@@ -25,7 +25,8 @@ def deploy
           :notes              => release_notes,
           :distribution_lists => (@configuration.distribution_lists || []).join(","),
           :notify             => @configuration.notify || false,
-          :replace            => @configuration.replace || false
+          :replace            => @configuration.replace || false,
+          :dsym               => @configuration.built_app_zipped_dsym_path
         }
         puts "Uploading build to TestFlight..."
         if @configuration.verbose

From fa5cc64beed40e4da71d545e5b9568b7f5248248 Mon Sep 17 00:00:00 2001
From: Miles Matthias <miles.matthias@gmail.com>
Date: Thu, 22 Aug 2013 08:32:24 -0600
Subject: [PATCH 12/20] Give testflight the file, not the path, of the zipped
 dsym.

---
 Rakefile                                             | 2 +-
 betabuilder.gemspec                                  | 2 +-
 lib/beta_builder/deployment_strategies/testflight.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Rakefile b/Rakefile
index 75f7d97..f050ae1 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "betabuilder"
-  s.version           = "0.7.4.9"
+  s.version           = "0.7.4.10"
   s.summary           = "A set of Rake tasks and utilities for managing iOS ad-hoc builds"
   s.author            = "Luke Redpath"
   s.email             = "luke@lukeredpath.co.uk"
diff --git a/betabuilder.gemspec b/betabuilder.gemspec
index b02208e..bd090ed 100644
--- a/betabuilder.gemspec
+++ b/betabuilder.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "betabuilder"
-  s.version = "0.7.4.9"
+  s.version = "0.7.4.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Luke Redpath"]
diff --git a/lib/beta_builder/deployment_strategies/testflight.rb b/lib/beta_builder/deployment_strategies/testflight.rb
index d7140f1..ead8b14 100644
--- a/lib/beta_builder/deployment_strategies/testflight.rb
+++ b/lib/beta_builder/deployment_strategies/testflight.rb
@@ -26,7 +26,7 @@ def deploy
           :distribution_lists => (@configuration.distribution_lists || []).join(","),
           :notify             => @configuration.notify || false,
           :replace            => @configuration.replace || false,
-          :dsym               => @configuration.built_app_zipped_dsym_path
+          :dsym               => File.new(@configuration.built_app_zipped_dsym_path, 'rb')
         }
         puts "Uploading build to TestFlight..."
         if @configuration.verbose

From 46a16409e5580423cc608f21e9af5aefcbd63ba8 Mon Sep 17 00:00:00 2001
From: Miles Matthias <miles.matthias@gmail.com>
Date: Thu, 22 Aug 2013 08:49:45 -0600
Subject: [PATCH 13/20] Fix zipping of the dsym.

---
 Rakefile            | 2 +-
 betabuilder.gemspec | 2 +-
 lib/beta_builder.rb | 9 ++++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Rakefile b/Rakefile
index f050ae1..85eddce 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "betabuilder"
-  s.version           = "0.7.4.10"
+  s.version           = "0.7.4.11"
   s.summary           = "A set of Rake tasks and utilities for managing iOS ad-hoc builds"
   s.author            = "Luke Redpath"
   s.email             = "luke@lukeredpath.co.uk"
diff --git a/betabuilder.gemspec b/betabuilder.gemspec
index bd090ed..14de843 100644
--- a/betabuilder.gemspec
+++ b/betabuilder.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "betabuilder"
-  s.version = "0.7.4.10"
+  s.version = "0.7.4.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Luke Redpath"]
diff --git a/lib/beta_builder.rb b/lib/beta_builder.rb
index dbcc565..3f7fda9 100644
--- a/lib/beta_builder.rb
+++ b/lib/beta_builder.rb
@@ -75,6 +75,10 @@ def ipa_name
           "#{target}.ipa"
         end
       end
+
+      def dsym_name
+        "#{app_file_name}.dSYM"
+      end
       
       def built_app_path
         if build_dir == :derived
@@ -94,9 +98,8 @@ def built_app_dsym_path
       end
 
       def built_app_zipped_dsym_path
-        zip_path = "#{built_app_path}.dSYM.zip"
-        system("zip -r #{zip_path} #{built_app_dsym_path}")
-        zip_path
+        system("cd #{built_app_path} && zip -r #{dsym_name}.zip #{dsym_name}")
+        "#{built_app_path}.dSYM.zip"
       end
       
       def dist_path

From e49955c86a9fd043b09736fbf6071e0eecf06b3f Mon Sep 17 00:00:00 2001
From: Miles Matthias <miles.matthias@gmail.com>
Date: Thu, 22 Aug 2013 08:55:58 -0600
Subject: [PATCH 14/20] Do the zip on deploy.

---
 Rakefile                                             | 2 +-
 betabuilder.gemspec                                  | 2 +-
 lib/beta_builder.rb                                  | 1 -
 lib/beta_builder/deployment_strategies/testflight.rb | 5 +++++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Rakefile b/Rakefile
index 85eddce..f1e6f02 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "betabuilder"
-  s.version           = "0.7.4.11"
+  s.version           = "0.7.4.12"
   s.summary           = "A set of Rake tasks and utilities for managing iOS ad-hoc builds"
   s.author            = "Luke Redpath"
   s.email             = "luke@lukeredpath.co.uk"
diff --git a/betabuilder.gemspec b/betabuilder.gemspec
index 14de843..ec4037b 100644
--- a/betabuilder.gemspec
+++ b/betabuilder.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "betabuilder"
-  s.version = "0.7.4.11"
+  s.version = "0.7.4.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Luke Redpath"]
diff --git a/lib/beta_builder.rb b/lib/beta_builder.rb
index 3f7fda9..5c0d0c3 100644
--- a/lib/beta_builder.rb
+++ b/lib/beta_builder.rb
@@ -98,7 +98,6 @@ def built_app_dsym_path
       end
 
       def built_app_zipped_dsym_path
-        system("cd #{built_app_path} && zip -r #{dsym_name}.zip #{dsym_name}")
         "#{built_app_path}.dSYM.zip"
       end
       
diff --git a/lib/beta_builder/deployment_strategies/testflight.rb b/lib/beta_builder/deployment_strategies/testflight.rb
index ead8b14..33d8239 100644
--- a/lib/beta_builder/deployment_strategies/testflight.rb
+++ b/lib/beta_builder/deployment_strategies/testflight.rb
@@ -15,9 +15,14 @@ def generate_release_notes(&block)
           end
         end
       end
+
+      def zip_dsym
+        system("cd #{@configuration.built_app_path} && zip -r #{@configuration.dsym_name}.zip #{@configuration.dsym_name}")
+      end
       
       def deploy
         release_notes = get_notes
+        zip_dsym
         payload = {
           :api_token          => @configuration.api_token,
           :team_token         => @configuration.team_token,

From e33f673c5eba8937c9bbd79dafc9a464b084ac66 Mon Sep 17 00:00:00 2001
From: Miles Matthias <miles.matthias@gmail.com>
Date: Thu, 22 Aug 2013 09:02:14 -0600
Subject: [PATCH 15/20] Zip the dsym on app prepare.

---
 Rakefile                                             | 2 +-
 betabuilder.gemspec                                  | 2 +-
 lib/beta_builder.rb                                  | 3 +++
 lib/beta_builder/deployment_strategies/testflight.rb | 5 -----
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Rakefile b/Rakefile
index f1e6f02..01b3f46 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "betabuilder"
-  s.version           = "0.7.4.12"
+  s.version           = "0.7.4.13"
   s.summary           = "A set of Rake tasks and utilities for managing iOS ad-hoc builds"
   s.author            = "Luke Redpath"
   s.email             = "luke@lukeredpath.co.uk"
diff --git a/betabuilder.gemspec b/betabuilder.gemspec
index ec4037b..b0bf966 100644
--- a/betabuilder.gemspec
+++ b/betabuilder.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "betabuilder"
-  s.version = "0.7.4.12"
+  s.version = "0.7.4.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Luke Redpath"]
diff --git a/lib/beta_builder.rb b/lib/beta_builder.rb
index 5c0d0c3..39f7212 100644
--- a/lib/beta_builder.rb
+++ b/lib/beta_builder.rb
@@ -146,6 +146,9 @@ def define
           Dir.chdir("pkg") do
             system("zip -r '#{@configuration.ipa_name}' Payload")
           end
+          Dir.chdir(@configuration.built_app_path) do
+            system("zip -r #{@configuration.dsym_name}.zip #{@configuration.dsym_name}")
+          end
           FileUtils.mkdir('pkg/dist')
           FileUtils.mv("pkg/#{@configuration.ipa_name}", "pkg/dist")
         end
diff --git a/lib/beta_builder/deployment_strategies/testflight.rb b/lib/beta_builder/deployment_strategies/testflight.rb
index 33d8239..6db5eb8 100644
--- a/lib/beta_builder/deployment_strategies/testflight.rb
+++ b/lib/beta_builder/deployment_strategies/testflight.rb
@@ -16,13 +16,8 @@ def generate_release_notes(&block)
         end
       end
 
-      def zip_dsym
-        system("cd #{@configuration.built_app_path} && zip -r #{@configuration.dsym_name}.zip #{@configuration.dsym_name}")
-      end
-      
       def deploy
         release_notes = get_notes
-        zip_dsym
         payload = {
           :api_token          => @configuration.api_token,
           :team_token         => @configuration.team_token,

From c983e4606053f989bdbaf4fd9cefb69b17de0dd2 Mon Sep 17 00:00:00 2001
From: Miles Matthias <miles.matthias@gmail.com>
Date: Thu, 22 Aug 2013 09:12:01 -0600
Subject: [PATCH 16/20] cd into the correct dir to zip the dsym.

---
 Rakefile            |  2 +-
 betabuilder.gemspec |  2 +-
 lib/beta_builder.rb | 14 +++++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Rakefile b/Rakefile
index 01b3f46..2a68bbb 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "betabuilder"
-  s.version           = "0.7.4.13"
+  s.version           = "0.7.4.14"
   s.summary           = "A set of Rake tasks and utilities for managing iOS ad-hoc builds"
   s.author            = "Luke Redpath"
   s.email             = "luke@lukeredpath.co.uk"
diff --git a/betabuilder.gemspec b/betabuilder.gemspec
index b0bf966..b60f271 100644
--- a/betabuilder.gemspec
+++ b/betabuilder.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "betabuilder"
-  s.version = "0.7.4.13"
+  s.version = "0.7.4.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Luke Redpath"]
diff --git a/lib/beta_builder.rb b/lib/beta_builder.rb
index 39f7212..7ab5780 100644
--- a/lib/beta_builder.rb
+++ b/lib/beta_builder.rb
@@ -79,15 +79,19 @@ def ipa_name
       def dsym_name
         "#{app_file_name}.dSYM"
       end
-      
-      def built_app_path
+
+      def built_path
         if build_dir == :derived
-          "#{derived_build_dir_from_build_output}/#{configuration}-iphoneos/#{app_file_name}"
+          "#{derived_build_dir_from_build_output}/#{configuration}-iphoneos/"
         else
-          "#{build_dir}/#{configuration}-iphoneos/#{app_file_name}"
+          "#{build_dir}/#{configuration}-iphoneos/"
         end
       end
       
+      def built_app_path
+        "#{built_path}/#{app_file_name}"
+      end
+      
       def derived_build_dir_from_build_output
         output = BuildOutputParser.new(File.read("build.output"))
         output.build_output_dir  
@@ -146,7 +150,7 @@ def define
           Dir.chdir("pkg") do
             system("zip -r '#{@configuration.ipa_name}' Payload")
           end
-          Dir.chdir(@configuration.built_app_path) do
+          Dir.chdir(@configuration.built_path) do
             system("zip -r #{@configuration.dsym_name}.zip #{@configuration.dsym_name}")
           end
           FileUtils.mkdir('pkg/dist')

From eb8acfb3a95c0b1852b98b9c7ad54a6110b8b6e2 Mon Sep 17 00:00:00 2001
From: Miles Matthias <miles.matthias@gmail.com>
Date: Thu, 22 Aug 2013 09:30:16 -0600
Subject: [PATCH 17/20] Use ditto instead of zip.

---
 Rakefile            | 2 +-
 betabuilder.gemspec | 2 +-
 lib/beta_builder.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Rakefile b/Rakefile
index 2a68bbb..d5fde50 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "betabuilder"
-  s.version           = "0.7.4.14"
+  s.version           = "0.7.4.15"
   s.summary           = "A set of Rake tasks and utilities for managing iOS ad-hoc builds"
   s.author            = "Luke Redpath"
   s.email             = "luke@lukeredpath.co.uk"
diff --git a/betabuilder.gemspec b/betabuilder.gemspec
index b60f271..6adb06f 100644
--- a/betabuilder.gemspec
+++ b/betabuilder.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "betabuilder"
-  s.version = "0.7.4.14"
+  s.version = "0.7.4.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Luke Redpath"]
diff --git a/lib/beta_builder.rb b/lib/beta_builder.rb
index 7ab5780..5d5bf39 100644
--- a/lib/beta_builder.rb
+++ b/lib/beta_builder.rb
@@ -151,7 +151,7 @@ def define
             system("zip -r '#{@configuration.ipa_name}' Payload")
           end
           Dir.chdir(@configuration.built_path) do
-            system("zip -r #{@configuration.dsym_name}.zip #{@configuration.dsym_name}")
+            system("ditto -c -k --sequesterRsrc --keepParent #{@configuration.dsym_name} #{@configuration.dsym_name}.zip")
           end
           FileUtils.mkdir('pkg/dist')
           FileUtils.mv("pkg/#{@configuration.ipa_name}", "pkg/dist")

From 0c177f0afed4b706833bc693caa9336e10c4bc3f Mon Sep 17 00:00:00 2001
From: Miles Matthias <miles.matthias@gmail.com>
Date: Sun, 25 Aug 2013 15:43:27 -0600
Subject: [PATCH 18/20] If you declare an arch then you should pass valid archs
 to ensure your arch will be built.

---
 Rakefile            | 2 +-
 betabuilder.gemspec | 4 ++--
 lib/beta_builder.rb | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Rakefile b/Rakefile
index d5fde50..c92800c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "betabuilder"
-  s.version           = "0.7.4.15"
+  s.version           = "0.7.4.16"
   s.summary           = "A set of Rake tasks and utilities for managing iOS ad-hoc builds"
   s.author            = "Luke Redpath"
   s.email             = "luke@lukeredpath.co.uk"
diff --git a/betabuilder.gemspec b/betabuilder.gemspec
index 6adb06f..0e940c4 100644
--- a/betabuilder.gemspec
+++ b/betabuilder.gemspec
@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "betabuilder"
-  s.version = "0.7.4.15"
+  s.version = "0.7.4.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Luke Redpath"]
-  s.date = "2013-08-22"
+  s.date = "2013-08-25"
   s.email = "luke@lukeredpath.co.uk"
   s.extra_rdoc_files = ["README.md", "LICENSE", "CHANGES.md"]
   s.files = ["CHANGES.md", "LICENSE", "README.md", "lib/beta_builder", "lib/beta_builder/archived_build.rb", "lib/beta_builder/build_output_parser.rb", "lib/beta_builder/deployment_strategies", "lib/beta_builder/deployment_strategies/testflight.rb", "lib/beta_builder/deployment_strategies/web.rb", "lib/beta_builder/deployment_strategies.rb", "lib/beta_builder.rb", "lib/betabuilder.rb"]
diff --git a/lib/beta_builder.rb b/lib/beta_builder.rb
index 5d5bf39..99310a4 100644
--- a/lib/beta_builder.rb
+++ b/lib/beta_builder.rb
@@ -129,7 +129,9 @@ def define
       namespace(@namespace) do
         desc "Build the beta release of the app"
         task :build => :clean do
-          xcodebuild @configuration.build_arguments, "build"
+          arch_args = ""
+          arch_args << "VALID_ARCHS=\"#{arch}\"" unless arch.nil?
+          xcodebuild @configuration.build_arguments, "build", arch_args
         end
         
         task :clean do

From 4b720d5b183060ed165ece1d462f2ae2f529b385 Mon Sep 17 00:00:00 2001
From: Miles Matthias <miles.matthias@gmail.com>
Date: Sun, 25 Aug 2013 16:00:09 -0600
Subject: [PATCH 19/20] Forgot where arch was.

---
 Rakefile            | 2 +-
 betabuilder.gemspec | 2 +-
 lib/beta_builder.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Rakefile b/Rakefile
index c92800c..9c005e9 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "betabuilder"
-  s.version           = "0.7.4.16"
+  s.version           = "0.7.4.17"
   s.summary           = "A set of Rake tasks and utilities for managing iOS ad-hoc builds"
   s.author            = "Luke Redpath"
   s.email             = "luke@lukeredpath.co.uk"
diff --git a/betabuilder.gemspec b/betabuilder.gemspec
index 0e940c4..6a914fb 100644
--- a/betabuilder.gemspec
+++ b/betabuilder.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "betabuilder"
-  s.version = "0.7.4.16"
+  s.version = "0.7.4.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Luke Redpath"]
diff --git a/lib/beta_builder.rb b/lib/beta_builder.rb
index 99310a4..893bdc2 100644
--- a/lib/beta_builder.rb
+++ b/lib/beta_builder.rb
@@ -130,7 +130,7 @@ def define
         desc "Build the beta release of the app"
         task :build => :clean do
           arch_args = ""
-          arch_args << "VALID_ARCHS=\"#{arch}\"" unless arch.nil?
+          arch_args << "VALID_ARCHS=\"#{@configuration.arch}\"" unless @configuration.arch.nil?
           xcodebuild @configuration.build_arguments, "build", arch_args
         end
         

From e2f49b53909fd0b596595ffe693fb7e2c319be38 Mon Sep 17 00:00:00 2001
From: Miles Matthias <miles.matthias@gmail.com>
Date: Tue, 27 Aug 2013 10:52:03 -0600
Subject: [PATCH 20/20] Use double quotes to escape any spaces in the name of
 the app.

---
 Rakefile            | 2 +-
 betabuilder.gemspec | 4 ++--
 lib/beta_builder.rb | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Rakefile b/Rakefile
index 9c005e9..40a7cac 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "betabuilder"
-  s.version           = "0.7.4.17"
+  s.version           = "0.7.4.18"
   s.summary           = "A set of Rake tasks and utilities for managing iOS ad-hoc builds"
   s.author            = "Luke Redpath"
   s.email             = "luke@lukeredpath.co.uk"
diff --git a/betabuilder.gemspec b/betabuilder.gemspec
index 6a914fb..e2d7589 100644
--- a/betabuilder.gemspec
+++ b/betabuilder.gemspec
@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "betabuilder"
-  s.version = "0.7.4.17"
+  s.version = "0.7.4.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Luke Redpath"]
-  s.date = "2013-08-25"
+  s.date = "2013-08-27"
   s.email = "luke@lukeredpath.co.uk"
   s.extra_rdoc_files = ["README.md", "LICENSE", "CHANGES.md"]
   s.files = ["CHANGES.md", "LICENSE", "README.md", "lib/beta_builder", "lib/beta_builder/archived_build.rb", "lib/beta_builder/build_output_parser.rb", "lib/beta_builder/deployment_strategies", "lib/beta_builder/deployment_strategies/testflight.rb", "lib/beta_builder/deployment_strategies/web.rb", "lib/beta_builder/deployment_strategies.rb", "lib/beta_builder.rb", "lib/betabuilder.rb"]
diff --git a/lib/beta_builder.rb b/lib/beta_builder.rb
index 893bdc2..9cea5a4 100644
--- a/lib/beta_builder.rb
+++ b/lib/beta_builder.rb
@@ -44,10 +44,10 @@ def build_arguments
         args = ""
         if workspace_path
           raise "A scheme is required if building from a workspace" unless scheme
-          args << "-workspace '#{workspace_path}' -scheme '#{scheme}' -configuration '#{configuration}'"
+          args << "-workspace \"#{workspace_path}\" -scheme \"#{scheme}\" -configuration '#{configuration}'"
         else
-          args = "-target '#{target}' -configuration '#{configuration}' -sdk iphoneos"
-          args << " -project #{project_file_path}" if project_file_path
+          args = "-target \"#{target}\" -configuration '#{configuration}' -sdk iphoneos"
+          args << " -project \"#{project_file_path}\"" if project_file_path
         end
 
         args << " -arch \"#{arch}\"" unless arch.nil?