betabuilder 0.6.0 → 0.7.0

data/CHANGES.md

@@ -1,4 +1,15 @@
-## 0.4.2
+## 0.7.0
+* Much improved Xcode 4 support.
+* Generate Xcode 4 style archives using the :xcode4_archive_mode
+* Xcode 4 style archives appear in Xcode organiser complete with your release notes.
+* Added a :skip_clean option to skip cleaning when building
+* Allow the app name to be explicitly set using :app_name
+* WARNING: Xcode 3 support is officially deprecated as of this release!
+
+## 0.6.0
+* Support Xcode 4 workspaces and schemes.
+
+## 0.5.0
 * Support configurable path to xcodebuild executable
 * Support configurable path to Xcode project file
 

data/lib/beta_builder.rb

@@ -12,7 +12,7 @@ module BetaBuilder
         :configuration => "Adhoc",
         :build_dir => "build",
         :auto_archive => false,
-        :archive_path  => File.expand_path("~/Library/Application Support/Developer/Shared/Archived Applications"),
+        :archive_path  => File.expand_path("~/Library/Developer/Xcode/Archives"),
         :xcodebuild_path => "xcodebuild",
         :project_file_path => nil,
         :workspace_path => nil,
@@ -43,6 +43,10 @@ module BetaBuilder
         end
       end
       
+      def archive_name
+        app_name || target
+      end
+      
       def app_file_name
         if app_name
           "#{app_name}.app"
@@ -149,8 +153,10 @@ module BetaBuilder
         
         desc "Build and archive the app"
         task :archive => :build do
-          archive = BetaBuilder::ArchivedBuild.new(@configuration)
-          archive.save_to(@configuration.archive_path)
+          puts "Archiving build..."
+          archive = BetaBuilder.archive(@configuration)
+          output_path = archive.save_to(@configuration.archive_path)
+          puts "Archive saved to #{output_path}."
         end
       end
     end

data/lib/beta_builder/archived_build.rb

@@ -1,7 +1,16 @@
 require 'uuid'
 require 'fileutils'
+require 'CFPropertyList'
 
 module BetaBuilder
+  def self.archive(configuration)
+    if configuration.xcode4_archive_mode
+      Xcode4ArchivedBuild.new(configuration)
+    else
+      ArchivedBuild.new(configuration)
+    end
+  end
+  
   class ArchivedBuild
     def initialize(configuration)
       @configuration = configuration
@@ -9,17 +18,83 @@ module BetaBuilder
     end
     
     def save_to(path)
-      if @configuration.xcode4_archive_mode
-        date_path = File.join(path, "#{Time.now.strftime('%Y-%m-%d')}")
-        FileUtils.mkdir_p(date_path)
-        archive_path = File.join(date_path, "#{@configuration.target}.xcarchive")
-      else
-        archive_path = File.join(path, "#{@uuid}.apparchive")
-      end
-      
+      archive_path = File.join(path, "#{@uuid}.apparchive")
       FileUtils.mkdir(archive_path)
       FileUtils.cp_r(@configuration.built_app_path, archive_path)
       FileUtils.cp_r(@configuration.built_app_dsym_path, archive_path)
+      archive_path
+    end
+  end
+  
+  class Xcode4ArchivedBuild
+    def initialize(configuration)
+      @configuration = configuration
+    end
+    
+    def archive_file_name
+      "#{@configuration.archive_name} #{Time.now.strftime('%Y-%m-%d %H.%M')}.xcarchive"
+    end
+    
+    def archive_path_within(path)
+      File.join(path, "#{Time.now.strftime('%Y-%m-%d')}", archive_file_name)
+    end
+    
+    def applications_path
+      File.join("Products", "Applications")
+    end
+    
+    def dsyms_path
+      "dSYMs"
+    end
+    
+    def plist_info_path
+      File.join(@configuration.built_app_path, "Info.plist")
+    end
+    
+    def save_to(path)
+      archive_path = archive_path_within(path)
+      FileUtils.mkdir_p(archive_path)
+      
+      application_path = File.join(archive_path, applications_path)
+      FileUtils.mkdir_p(application_path)
+      FileUtils.cp_r(@configuration.built_app_path, application_path)
+      
+      dsym_path = File.join(archive_path, dsyms_path)
+      FileUtils.mkdir_p(dsym_path)
+      FileUtils.cp_r(@configuration.built_app_dsym_path, dsym_path)
+      
+      write_plist_to(archive_path)
+      archive_path
+    end
+    
+    private
+    
+    def write_plist_to(path)
+      plist = {
+        "ApplicationProperties" => {
+          "ApplicationPath"             => File.join("Applications", "#{@configuration.app_file_name}.app"),
+          "CFBundleIdentifier"          => metadata["CFBundleIdentifier"], 
+          "CFBundleShortVersionString"  => metadata["CFBundleShortVersionString"], 
+          "IconPaths"                   => metadata["CFBundleIconFiles"].map { |file| File.join("Applications", @configuration.app_file_name, file) }
+        }, 
+        "ArchiveVersion" => 1.0, 
+        "Comment"        => @configuration.release_notes, 
+        "CreationDate"   => Time.now, 
+        "Name"           => @configuration.archive_name, 
+        "SchemeName"     => @configuration.scheme
+      }
+      File.open(File.join(path, "Info.plist"), "w") do |io|
+        io.write plist.to_plist
+      end
+    end
+    
+    def metadata
+      @metadata ||= load_property_list(plist_info_path)
+    end
+    
+    def load_property_list(path)
+      plist = CFPropertyList::List.new(:file => path)
+      CFPropertyList.native_types(plist.value)
     end
   end
 end

data/lib/beta_builder/deployment_strategies/testflight.rb

@@ -53,7 +53,7 @@ module BetaBuilder
         begin
           filepath = "#{dir}/release_notes"
           system("#{editor} #{filepath}")
-          notes = File.read(filepath)
+          @configuration.release_notes = File.read(filepath)
         ensure
           rm_rf(dir)
         end
@@ -61,7 +61,7 @@ module BetaBuilder
       
       def get_notes_using_prompt
         puts "Enter the release notes for this build (hit enter twice when done):\n"
-        gets_until_match(/\n{2}$/).strip
+        @configuration.release_notes = gets_until_match(/\n{2}$/).strip
       end
       
       def gets_until_match(pattern, string = "")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: betabuilder
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
-  requirement: &2156056740 !ruby/object:Gem::Requirement
+  requirement: &2152291440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156056740
+  version_requirements: *2152291440
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &2156056260 !ruby/object:Gem::Requirement
+  requirement: &2152290800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 2.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156056260
+  version_requirements: *2152290800
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2156054940 !ruby/object:Gem::Requirement
+  requirement: &2152290280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156054940
+  version_requirements: *2152290280
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2156053160 !ruby/object:Gem::Requirement
+  requirement: &2152289800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +55,7 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2156053160
+  version_requirements: *2152289800
 description: 
 email: luke@lukeredpath.co.uk
 executables: []