xcoder 0.1.13 → 0.1.14

data/README.md

@@ -19,7 +19,7 @@ You will need to install the gem:
 and then require the gem in your project/rakefile/etc
 
 	require 'xcoder'
-	
+
 ### Load a project
 
     project = Xcode.project('MyProject')  # Can be the name, the file (e.g. MyProject.xcodeproj) or the path
@@ -27,20 +27,24 @@ and then require the gem in your project/rakefile/etc
 ### Finding all projects from the current directory down
 
 	Xcode.find_projects.each {|p| puts p.name }
-	
+
 ### Find a configuration for a target on a project
 
 	config = Xcode.project(:MyProject).target(:Target).config(:Debug)	# returns an Xcode::Configuration object
 
 ### Building a configuration
 
+	config = Xcode.project(:MyProject).target(:Target).config(:Debug)
 	builder = config.builder
 	builder.profile = 'Profiles/MyAdHoc.mobileprovision'	# This will remove old profiles and install the profile
 	builder.identity = 'iPhone Developer: Ray Hilton'		# The name of the identity to use to sign the IPA (optional)
+	builder.clean
 	builder.build
-	
+	# Building uses the targets's default sdk, which you can override:
+	builder.build :sdk => :iphonesimulator
+
 ### Working with Keychains
-	
+
 You will not normally need to worry about manipulating keychains unless you want to automate importing of certificates (in a CI system with many clients) or opening of specific keychains for different builds (the old two-certs-with-same-identity-name workaround).
 
 You can either use the user's login keychain, another named keychain, or simply use a temporary keychain that will be blown away after the build.
@@ -51,26 +55,26 @@ You can either use the user's login keychain, another named keychain, or simply
 		# import certs into the keychain
 		# perform builds within this keychain's context
 	end	# Keychain is deleted
-	
+
 Or, you can create a temporary keychain that will be deleted when the process exits:
 
 	keychain = Xcode::Keychain.temp
 
-		
+
 #### Importing a certificate
 
 You can import a certificate from a .p12 file into a keychain.  Here we simply create a temporary keychain, import a certificate, set the identity onto the builder and then perform a build.
- 
-	keychain.import 'Certs/MyCert.p12', 'mycertpassword'		
+
+	keychain.import 'Certs/MyCert.p12', 'mycertpassword'
 	builder.keychain = keychain						# Tell the builder to use the temp keychain
 	builder.identity = keychain.identities.first	# Get the first (only) identity name from the keychain
-	
+
 ### Packaging a built .app
 
 After performing the above build, you can create a versioned, well named .ipa and .dSYM.zip
 
 	builder.package
-	
+
 This will produce something like: MyProject-Debug-1.0.ipa and MyProject-Debug-1.0.dSYM.zip
 
 ### Incrementing the build number
@@ -85,15 +89,15 @@ This will produce something like: MyProject-Debug-1.0.ipa and MyProject-Debug-1.
 Loading workspaces can be done in a similar way to projects:
 
 	Xcode.workspaces.each do |w|
-	  w.describe								# prints a recursive description of the 
+	  w.describe								# prints a recursive description of the
 												# structure of the workspace and its projects
 	end
-	
+
 Or, if you know the name:
 
 	workspace = Xcode.workspace('MyWorkspace')  # Can be the name, the file (e.g. MyWorkspace.xcworkspace) or the path
-	
-	
+
+
 ### Schemes
 
 There is basic support for schemes, you can enumerate them from a project like so:
@@ -101,11 +105,11 @@ There is basic support for schemes, you can enumerate them from a project like s
 	project.schemes.each do |s|
 	  s.builder.build
 	end
-	
+
 Or, access them by name:
 
 	builder = project.scheme('MyScheme').builder
-	
+
 Note: The builder behaves the same as the builder for the target/config approach and will force xcodebuild to use the local build/ directory (as per xcode3) rather than a generated temporary directory in DerivedData.  This may or may not be a good thing.
 
 Note: Shared schemes and user (current logged in user) specific schemes are both loaded. They may share names and other similarities that make them hard to distinguish. Currently the priority loading order is shared schemes and then user specific schemes.
@@ -115,9 +119,9 @@ Note: Shared schemes and user (current logged in user) specific schemes are both
 The library provides a mechanism to install/uninstall a provisioning profile.  This normally happens as part of a build (if a profile is provided to the builder, see above), but you can do this manually:
 
 	Xcode::ProvisioningProfile.new("Myprofile.mobileprovision").install	# installs profile into ~/Library
-	
+
 Or enumerate installed profiles:
-   
+
 	Xcode::ProvisioningProfile.installed_profiles.each do |p|
 		p.uninstall		# Removes the profile from ~/Library/
 	end
@@ -131,7 +135,7 @@ The common output of this build/package process is to upload to Testflight.  Thi
  	  tf.notify = true	# Whether to send a notification to users, default is true
       tf.lists << "AList"  # The lists to distribute the build to
 	end
-	
+
 You can also optionally set a .proxy= property or just set the HTTP_PROXY environment variable.
 
 ### OCUnit to JUnit reports
@@ -140,14 +144,14 @@ You can invoke your test target/bundle from the builder
 
 	builder.test do |report|
 		report.debug = false	# default false, set to true to see raw output from xcodebuild
-		
+
 		# The following is the default setup, you wouldnt normally need to do this unless
 		# you want to add new formatters
 		report.formatters = []
 		report.add_formatter :junit, 'test-reports'	# Output JUnit format results to test-reports/
 		report.add_formatter :stdout				# Output a simplified output to STDOUT
 	end
-	
+
 This will invoke the test target, capture the output and write the junit reports to the test-reports directory.  Currently only junit is supported, although you can write your own formatter quite easily (for an example, look at Xcode::Test::Formatters::JunitFormatter).
 
 ## Rake Tasks
@@ -157,13 +161,13 @@ Xcoder provides a rake task to assist with make it easier to perform common Xcod
 Within your `Rakefile` add the following:
 
     require 'xcoder/rake_task'
-    
+
 Then define your Rake Task:
 
     Xcode::RakeTask.new
 
 By default this will generate rake tasks within the 'xcode' namespace for
-all the projects (within the current working directory), all their targets, 
+all the projects (within the current working directory), all their targets,
 and all their configs. This will also generate tasks for all of a projects
 schemes as well.
 
@@ -173,14 +177,14 @@ schemes as well.
 
 This will generate rake tasks that appear similar to the following:
 
-      rake xcode:project-name:targetname:debug:build   
-      rake xcode:project-name:targetname:debug:clean         
+      rake xcode:project-name:targetname:debug:build
+      rake xcode:project-name:targetname:debug:clean
       # ...
 
 You can specify a parameter to change the root rake namespace:
 
      Xcode::RakeTask.new :apple
-     
+
      # Resulting Rake Tasks:
      # rake apple:project-name:targetname:debug:build
      # rake apple:project-name:targetname:debug:clean
@@ -192,7 +196,7 @@ You can also supply a block to provide additional configuration to specify the f
        xcoder.directory = "projects"
        xcoder.projects = [ "Project Alpha", "Project Beta" ]
      end
-     
+
      rake hudson:project-alpha:targetname:debug:build
      # ...
 
@@ -202,7 +206,7 @@ Guard provides the ability to launch commands when files changed. There is a [gu
 
     gem install guard
     gem install guard-xcoder
-    
+
     guard init
     guard init xcoder
 
@@ -232,7 +236,7 @@ project.group('Vendor/Reachability') do
  # Create files for each source file defined above
  source_files.each |source| create_file source }
 end
-```     
+```
 
 Within the project file the groups in the path are created or found and then file references are added for the two specified source files. Xcoder only updates the logical project file, it does not copy physical files, that is done by the FileUtils.
 
@@ -283,7 +287,7 @@ target.config 'Release' do |config|
 end
 ```
 
-Configuration settings can be accessed through `get`, `set`, and `append` with their [Xcode Build Names](https://developer.apple.com/library/mac/#documentation/DeveloperTools/Reference/XcodeBuildSettingRef/1-Build_Setting_Reference/build_setting_ref.html#//apple_ref/doc/uid/TP40003931-CH3-SW110) or through convenience methods generated for most of the build settings (`property_name`, `property_name=`, `append_to_property_name`). The entire list of property names can be found in the [configuration](/rayh/xcoder/blob/master/lib/xcode/configuration.rb). 
+Configuration settings can be accessed through `get`, `set`, and `append` with their [Xcode Build Names](https://developer.apple.com/library/mac/#documentation/DeveloperTools/Reference/XcodeBuildSettingRef/1-Build_Setting_Reference/build_setting_ref.html#//apple_ref/doc/uid/TP40003931-CH3-SW110) or through convenience methods generated for most of the build settings (`property_name`, `property_name=`, `append_to_property_name`). The entire list of property names can be found in the [configuration](/rayh/xcoder/blob/master/lib/xcode/configuration.rb).
 
 
 ### Saving your changes!
@@ -300,10 +304,10 @@ Within the `specs/integration` folder there are more examples.
 
 ## Tests
 
-There are some basic RSpec tests in the project which I suspect /wont/ work on machines without my identity installed.  
+There are some basic RSpec tests in the project which I suspect /wont/ work on machines without my identity installed.
 
 Currently these tests only assert the basic project file parsing and build code and do not perform file modification tests (e.g. for info plists) or provisioning profile/keychain importing
-	
+
 ## Feedback
 
-Please raise issues if you find defects or have a feature request.  
+Please raise issues if you find defects or have a feature request.

data/lib/xcode/builder.rb

@@ -2,237 +2,6 @@ require 'xcode/shell'
 require 'xcode/provisioning_profile'
 require 'xcode/test/parsers/ocunit_parser.rb'
 require 'xcode/testflight'
-
-module Xcode
-
-  #
-  # This class tries to pull various bits of Xcoder together to provide a higher-level API for common 
-  # project build tasks.
-  #
-  class Builder
-    attr_accessor :profile, :identity, :build_path, :keychain, :sdk, :objroot, :symroot
-    
-    def initialize(config)
-      if config.is_a? Xcode::Scheme
-        @scheme = config
-        config = config.launch
-      end
-      
-      #puts "CONFIG: #{config}"
-      @target = config.target
-      @sdk = @target.project.sdk
-      @config = config
-      @build_path = "#{File.dirname(@target.project.path)}/build/"
-      @objroot = @build_path
-      @symroot = @build_path
-    end
-    
-    
-    def build(options = {:sdk => @sdk})    
-      cmd = build_command(options)
-      with_keychain do
-        Xcode::Shell.execute(cmd)
-      end
-      self
-    end
-     
-    # 
-    # Invoke the configuration's test target and parse the resulting output
-    #
-    # If a block is provided, the report is yielded for configuration before the test is run
-    #
-    def test(options = {:sdk => 'iphonesimulator'}) #, :parser => :OCUnit })
-      cmd = build_command(options)
-      cmd << "TEST_AFTER_BUILD=YES"
-      
-      report = Xcode::Test::Report.new
-      if block_given?
-        yield(report)
-      else
-        report.add_formatter :stdout
-        report.add_formatter :junit, 'test-reports'
-      end
-      
-      parser = Xcode::Test::Parsers::OCUnitParser.new report
-      
-      begin
-        Xcode::Shell.execute(cmd, false) do |line|
-          parser << line
-        end
-      rescue Xcode::Shell::ExecutionError => e
-        puts "Test platform exited: #{e.message}"
-      ensure
-        parser.flush
-      end
-      
-      report
-    end
-    
-    def testflight(api_token, team_token)
-      raise "Can't find #{ipa_path}, do you need to call builder.package?" unless File.exists? ipa_path
-      raise "Can't fins #{dsym_zip_path}, do you need to call builder.package?" unless File.exists? dsym_zip_path
-      
-      testflight = Xcode::Testflight.new(api_token, team_token)
-      yield(testflight) if block_given?
-      testflight.upload(ipa_path, dsym_zip_path)
-    end
-    
-    def clean
-      cmd = []
-      cmd << "xcodebuild"
-      cmd << "-project \"#{@target.project.path}\""
-      cmd << "-sdk #{@sdk}" unless @sdk.nil?
-      
-      cmd << "-scheme \"#{@scheme.name}\"" unless @scheme.nil?
-      cmd << "-target \"#{@target.name}\"" if @scheme.nil?
-      cmd << "-configuration \"#{@config.name}\"" if @scheme.nil?
-      
-      cmd << "OBJROOT=\"#{@build_path}\""
-      cmd << "SYMROOT=\"#{@build_path}\""
-      cmd << "clean"
-      Xcode::Shell.execute(cmd)
-      
-      @built = false
-      @packaged = false
-      # FIXME: Totally not safe
-      # cmd = []
-      # cmd << "rm -Rf #{build_path}"
-      # Xcode::Shell.execute(cmd)
-      self
-    end    
-    
-    def sign
-      cmd = []
-      cmd << "codesign"
-      cmd << "--force"
-      cmd << "--sign \"#{@identity}\""
-      cmd << "--resource-rules=\"#{app_path}/ResourceRules.plist\""
-      cmd << "--entitlements \"#{entitlements_path}\""
-      cmd << "\"#{ipa_path}\""
-      Xcode::Shell.execute(cmd)
- 
-# CodeSign build/AdHoc-iphoneos/Dial.app
-#     cd "/Users/ray/Projects/Clients/CBAA/Community Radio"
-#     setenv CODESIGN_ALLOCATE /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/codesign_allocate
-#     setenv PATH "/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin:/Developer/usr/bin:/Users/ray/.rvm/gems/ruby-1.9.2-p290@cbaa/bin:/Users/ray/.rvm/gems/ruby-1.9.2-p290@global/bin:/Users/ray/.rvm/rubies/ruby-1.9.2-p290/bin:/Users/ray/.rvm/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin:/usr/local/git/bin"
-#     /usr/bin/codesign --force --sign "iPhone Distribution: Community Broadcasting Association of Australia" "--resource-rules=/Users/ray/Projects/Clients/CBAA/Community Radio/build/AdHoc-iphoneos/Dial.app/ResourceRules.plist" --keychain "\"/Users/ray/Projects/Clients/CBAA/Community\\" "Radio/Provisioning/CBAA.keychain\"" --entitlements "/Users/ray/Projects/Clients/CBAA/Community Radio/build/CommunityRadio.build/AdHoc-iphoneos/CommunityRadio.build/Dial.xcent" "/Users/ray/Projects/Clients/CBAA/Community Radio/build/AdHoc-iphoneos/Dial.app"
-# iPhone Distribution: Community Broadcasting Association of Australia: no identity found
-# Command /usr/bin/codesign failed with exit code 1
-      self
-    end
-    
-    def package
-      raise "Can't find #{app_path}, do you need to call builder.build?" unless File.exists? app_path
-      
-      #package IPA
-      cmd = []      
-      cmd << "xcrun"
-      cmd << "-sdk #{@sdk}" unless @sdk.nil?
-      cmd << "PackageApplication"
-      cmd << "-v \"#{app_path}\""
-      cmd << "-o \"#{ipa_path}\""
-      
-      # cmd << "OTHER_CODE_SIGN_FLAGS=\"--keychain #{@keychain.path}\"" unless @keychain.nil?
-      # 
-      # unless @identity.nil?
-      #   cmd << "--sign \"#{@identity}\""
-      # end
-      
-      unless @profile.nil?
-        cmd << "--embed \"#{@profile}\""
-      end
-      
-      with_keychain do
-        Xcode::Shell.execute(cmd)
-      end
-      
-      # package dSYM
-      cmd = []
-      cmd << "zip"
-      cmd << "-r"
-      cmd << "-T"
-      cmd << "-y \"#{dsym_zip_path}\""
-      cmd << "\"#{dsym_path}\""
-      Xcode::Shell.execute(cmd)
-
-      self
-    end
-    
-    def configuration_build_path
-      "#{build_path}/#{@config.name}-#{@sdk}"
-    end
-    
-    def entitlements_path
-      "#{build_path}/#{@target.name}.build/#{name}-#{@target.project.sdk}/#{@target.name}.build/#{@config.product_name}.xcent"
-    end
-    
-    def app_path
-      "#{configuration_build_path}/#{@config.product_name}.app"
-    end
-    
-    def product_version_basename
-      version = @config.info_plist.version
-      version = "SNAPSHOT" if version.nil? or version==""
-      "#{configuration_build_path}/#{@config.product_name}-#{@config.name}-#{version}"
-    end
-
-    def ipa_path
-      "#{product_version_basename}.ipa"
-    end
-    
-    def dsym_path
-      "#{app_path}.dSYM"
-    end
-    
-    def dsym_zip_path
-      "#{product_version_basename}.dSYM.zip"
-    end
-    
-    
-    private 
-    
-    def with_keychain(&block)
-      if @keychain.nil?
-        yield
-      else
-        Xcode::Keychains.with_keychain_in_search_path @keychain, &block
-      end
-    end
-    
-    def install_profile
-      return nil if @profile.nil?
-      # TODO: remove other profiles for the same app?
-      p = ProvisioningProfile.new(@profile)
-      
-      ProvisioningProfile.installed_profiles.each do |installed|
-        if installed.identifiers==p.identifiers and installed.uuid==p.uuid
-          installed.uninstall
-        end
-      end
-      
-      p.install
-      p
-    end
-    
-    def build_command(options = {})
-      options = {:sdk => @sdk}.merge options
-      profile = install_profile
-      cmd = []
-      cmd << "xcodebuild"
-      cmd << "-sdk #{options[:sdk]}" unless options[:sdk].nil?
-      cmd << "-project \"#{@target.project.path}\""
-      
-      cmd << "-scheme \"#{@scheme.name}\"" unless @scheme.nil?
-      cmd << "-target \"#{@target.name}\"" if @scheme.nil?
-      cmd << "-configuration \"#{@config.name}\"" if @scheme.nil?
-      
-      cmd << "OTHER_CODE_SIGN_FLAGS='--keychain #{@keychain.path}'" unless @keychain.nil?
-      cmd << "CODE_SIGN_IDENTITY=\"#{@identity}\"" unless @identity.nil?
-      cmd << "OBJROOT=\"#{@objroot}\""
-      cmd << "SYMROOT=\"#{@symroot}\""
-      cmd << "PROVISIONING_PROFILE=#{profile.uuid}" unless profile.nil?
-      cmd
-    end
-    
-  end
-end
+require 'xcode/builder/base_builder.rb'
+require 'xcode/builder/project_target_config_builder.rb'
+require 'xcode/builder/scheme_builder.rb'