betabuilder 0.7.3 → 0.7.4.1

data/CHANGES.md

@@ -1,3 +1,15 @@
+## 0.7.4.1
+* Allow auto-archiving from other Rake namespaces (@victor)
+* Fixed bug with Xcode archive sharing (@victor)
+* Fall back on CFBundleVersion if CFBundleVersionShortString is not set (@subdigital)
+* Added verbose and dry run options to the TestFlight deployment strategy (@subdigital)
+* Defer dynamic release note generation until runtime (@subdigital)
+* Allow architectures to be configured (@subdigital)
+* Fix detection of build directories containing spaces
+
+# 0.7.4
+* YANKED
+
 ## 0.7.3
 * Made the Xcode derived data directory more robust by grepping for the Validate line in the log.
 

data/lib/beta_builder.rb

@@ -18,31 +18,42 @@ module BetaBuilder
         :workspace_path => nil,
         :scheme => nil,
         :app_name => nil,
+        :arch => nil,
         :xcode4_archive_mode => false,
-        :skip_clean => false
+        :skip_clean => false,
+        :verbose => false,
+        :dry_run => false
       )
       @namespace = namespace
       yield @configuration if block_given?
       define
     end
-    
+
     def xcodebuild(*args)
       # we're using tee as we still want to see our build output on screen
       system("#{@configuration.xcodebuild_path} #{args.join(" ")} | tee build.output")
     end
-    
+
     class Configuration < OpenStruct
+      def release_notes_text
+        return release_notes.call if release_notes.is_a? Proc
+        release_notes
+      end
       def build_arguments
+        args = ""
         if workspace_path
           raise "A scheme is required if building from a workspace" unless scheme
-          "-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
         end
+
+        args << " -arch \"#{arch}\"" unless arch.nil?
+
+        args
       end
-      
+
       def archive_name
         app_name || target
       end
@@ -76,7 +87,12 @@ module BetaBuilder
         output = File.read("build.output")
         
         # yes, this is truly horrible, but unless somebody else can find a better way...
-        reference = output.split("\n").grep(/^Validate(.*)\/Xcode\/DerivedData\/(.*)-(.*)/).first.split(" ").last
+        found = output.split("\n").grep(/^Validate(.*)\/Xcode\/DerivedData\/(.*)-(.*)/).first
+        if found && found =~ /Validate \"(.*)\"/
+            reference = $1 
+        else 
+            raise "Cannot parse build_dir from build output."
+        end        
         derived_data_directory = reference.split("/Build/Products/").first
         "#{derived_data_directory}/Build/Products/"
       end
@@ -121,7 +137,7 @@ module BetaBuilder
         desc "Package the beta release as an IPA file"
         task :package => :build do
           if @configuration.auto_archive
-            Rake::Task['beta:archive'].invoke
+            Rake::Task["#{@namespace}:archive"].invoke
           end
                     
           FileUtils.rm_rf('pkg') && FileUtils.mkdir_p('pkg')

data/lib/beta_builder/archived_build.rb

@@ -70,15 +70,16 @@ module BetaBuilder
     private
     
     def write_plist_to(path)
+      version = metadata["CFBundleShortVersionString"] || metadata["CFBundleVersion"]
       plist = {
         "ApplicationProperties" => {
-          "ApplicationPath"             => File.join("Applications", "#{@configuration.app_file_name}.app"),
+          "ApplicationPath"             => File.join("Applications", @configuration.app_file_name),
           "CFBundleIdentifier"          => metadata["CFBundleIdentifier"], 
-          "CFBundleShortVersionString"  => metadata["CFBundleShortVersionString"], 
+          "CFBundleShortVersionString"  => version, 
           "IconPaths"                   => metadata["CFBundleIconFiles"].map { |file| File.join("Applications", @configuration.app_file_name, file) }
         }, 
         "ArchiveVersion" => 1.0, 
-        "Comment"        => @configuration.release_notes, 
+        "Comment"        => @configuration.release_notes_text,
         "CreationDate"   => Time.now, 
         "Name"           => @configuration.archive_name, 
         "SchemeName"     => @configuration.scheme

data/lib/beta_builder/deployment_strategies/testflight.rb

@@ -11,21 +11,31 @@ module BetaBuilder
       def extended_configuration_for_strategy
         proc do
           def generate_release_notes(&block)
-            self.release_notes = yield if block_given?
+            self.release_notes = block if block
           end
         end
       end
       
       def deploy
+        release_notes = get_notes
         payload = {
           :api_token          => @configuration.api_token,
           :team_token         => @configuration.team_token,
           :file               => File.new(@configuration.ipa_path, 'rb'),
-          :notes              => get_notes,
+          :notes              => release_notes,
           :distribution_lists => (@configuration.distribution_lists || []).join(","),
           :notify             => @configuration.notify || false
         }
         puts "Uploading build to TestFlight..."
+        if @configuration.verbose
+          puts "ipa path: #{@configuration.ipa_path}"
+          puts "release notes: #{release_notes}"
+        end
+        
+        if @configuration.dry_run 
+          puts '** Dry Run - No action here! **'
+          return
+        end
         
         begin
           response = RestClient.post(ENDPOINT, payload, :accept => :json)
@@ -43,7 +53,8 @@ module BetaBuilder
       private
       
       def get_notes
-        @configuration.release_notes || get_notes_using_editor || get_notes_using_prompt
+        notes = @configuration.release_notes_text
+        notes || get_notes_using_editor || get_notes_using_prompt
       end
       
       def get_notes_using_editor

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: betabuilder
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-05 00:00:00.000000000 +01:00
-default_executable: 
+date: 2011-11-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
-  requirement: &2168703340 !ruby/object:Gem::Requirement
+  requirement: &2153611800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2168703340
+  version_requirements: *2153611800
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &2168702700 !ruby/object:Gem::Requirement
+  requirement: &2153611260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +32,10 @@ dependencies:
         version: 2.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *2168702700
+  version_requirements: *2153611260
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2168687560 !ruby/object:Gem::Requirement
+  requirement: &2153610720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +43,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2168687560
+  version_requirements: *2153610720
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2168685620 !ruby/object:Gem::Requirement
+  requirement: &2153610200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +54,7 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2168685620
+  version_requirements: *2153610200
 description: 
 email: luke@lukeredpath.co.uk
 executables: []
@@ -74,7 +73,6 @@ files:
 - lib/beta_builder/deployment_strategies.rb
 - lib/beta_builder.rb
 - lib/betabuilder.rb
-has_rdoc: true
 homepage: http://github.com/lukeredpath/betabuilder
 licenses: []
 post_install_message: 
@@ -97,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A set of Rake tasks and utilities for managing iOS ad-hoc builds