betabuilder 0.5.0 → 0.6.0

data/lib/beta_builder/archived_build.rb

@@ -9,7 +9,14 @@ module BetaBuilder
     end
     
     def save_to(path)
-      archive_path = File.join(path, "#{@uuid}.apparchive")
+      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
+      
       FileUtils.mkdir(archive_path)
       FileUtils.cp_r(@configuration.built_app_path, archive_path)
       FileUtils.cp_r(@configuration.built_app_dsym_path, archive_path)

data/lib/beta_builder.rb

@@ -14,7 +14,12 @@ module BetaBuilder
         :auto_archive => false,
         :archive_path  => File.expand_path("~/Library/Application Support/Developer/Shared/Archived Applications"),
         :xcodebuild_path => "xcodebuild",
-        :project_file_path => nil
+        :project_file_path => nil,
+        :workspace_path => nil,
+        :scheme => nil,
+        :app_name => nil,
+        :xcode4_archive_mode => false,
+        :skip_clean => false
       )
       @namespace = namespace
       yield @configuration if block_given?
@@ -22,25 +27,53 @@ module BetaBuilder
     end
     
     def xcodebuild(*args)
-      system("#{@configuration.xcodebuild_path} #{args.join(" ")}")
+      # 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 build_arguments
-        args = "-target '#{target}' -configuration '#{configuration}' -sdk iphoneos"
-        args << " -project #{project_file_path}" if project_file_path
+        if workspace_path
+          raise "A scheme is required if building from a workspace" unless scheme
+          "-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
       end
       
-      def app_name
-        "#{target}.app"
+      def app_file_name
+        if app_name
+          "#{app_name}.app"
+        else
+          "#{target}.app"
+        end
       end
       
       def ipa_name
-        "#{target}.ipa"
+        if app_name
+          "#{app_name}.ipa"
+        else
+          "#{target}.ipa"
+        end
       end
       
       def built_app_path
-        "#{build_dir}/#{configuration}-iphoneos/#{app_name}"
+        if build_dir == :derived
+          "#{derived_build_dir_from_build_output}/#{configuration}-iphoneos/#{app_file_name}"
+        else
+          "#{build_dir}/#{configuration}-iphoneos/#{app_file_name}"
+        end
+      end
+      
+      def derived_build_dir_from_build_output
+        output = File.read("build.output")
+        
+        # yes, this is truly horrible, but unless somebody else can find a better way...
+        reference = output.split("\n").grep(/Xcode\/DerivedData\/#{scheme}-(.*)/).first.split(" ").last
+        derived_data_directory = reference.split("/Build/Products").first
+        "#{derived_data_directory}/Build/Products/"
       end
       
       def built_app_dsym_path
@@ -75,7 +108,9 @@ module BetaBuilder
         end
         
         task :clean do
-          xcodebuild @configuration.build_arguments, "clean"
+          unless @configuration.skip_clean
+            xcodebuild @configuration.build_arguments, "clean"
+          end
         end
         
         desc "Package the beta release as an IPA file"
@@ -86,7 +121,7 @@ module BetaBuilder
                     
           FileUtils.rm_rf('pkg') && FileUtils.mkdir_p('pkg')
           FileUtils.mkdir_p("pkg/Payload")
-          FileUtils.mv(@configuration.built_app_path, "pkg/Payload/#{@configuration.app_name}")
+          FileUtils.mv(@configuration.built_app_path, "pkg/Payload/#{@configuration.app_file_name}")
           Dir.chdir("pkg") do
             system("zip -r '#{@configuration.ipa_name}' Payload")
           end

metadata

@@ -1,97 +1,70 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: betabuilder
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 0.6.0
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 0
-  version: 0.5.0
 platform: ruby
-authors: 
+authors:
 - Luke Redpath
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-17 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-07-22 00:00:00.000000000 +01:00
+default_executable: 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: CFPropertyList
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2156056740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: uuid
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2156056740
+- !ruby/object:Gem::Dependency
+  name: uuid
+  requirement: &2156056260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 2
-        - 3
-        - 1
+      - !ruby/object:Gem::Version
         version: 2.3.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2156056260
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &2156054940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 6
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2156054940
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &2156053160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 4
-        - 6
+      - !ruby/object:Gem::Version
         version: 1.4.6
   type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *2156053160
 description: 
 email: luke@lukeredpath.co.uk
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - LICENSE
 - CHANGES.md
-files: 
+files:
 - CHANGES.md
 - LICENSE
 - README.md
@@ -101,39 +74,31 @@ 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: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.md
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A set of Rake tasks and utilities for managing iOS ad-hoc builds
 test_files: []
-