xcoder 0.1.10 → 0.1.11

data/lib/xcode/builder.rb

@@ -4,6 +4,11 @@ require 'xcode/test/ocunit_report_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
     
@@ -20,24 +25,12 @@ module Xcode
       @build_path = "#{File.dirname(@target.project.path)}/build/"
     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(sdk=@sdk)    
       cmd = build_command(@sdk)
-      Xcode::Shell.execute(cmd)
+      with_keychain do
+        Xcode::Shell.execute(cmd)
+      end
       self
     end
     
@@ -78,7 +71,7 @@ module Xcode
       cmd << "-project \"#{@target.project.path}\""
       cmd << "-sdk #{@sdk}" unless @sdk.nil?
       
-      cmd << "-scheme #{@scheme.name}" unless @scheme.nil?
+      cmd << "-scheme \"#{@scheme.name}\"" unless @scheme.nil?
       cmd << "-target \"#{@target.name}\"" if @scheme.nil?
       cmd << "-configuration \"#{@config.name}\"" if @scheme.nil?
       
@@ -137,7 +130,9 @@ module Xcode
         cmd << "--embed \"#{@profile}\""
       end
       
-      Xcode::Shell.execute(cmd)
+      with_keychain do
+        Xcode::Shell.execute(cmd)
+      end
       
       # package dSYM
       cmd = []
@@ -184,6 +179,29 @@ module Xcode
     
     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(sdk=@sdk)
       profile = install_profile
       cmd = []
@@ -191,7 +209,7 @@ module Xcode
       cmd << "-sdk #{sdk}" unless sdk.nil?
       cmd << "-project \"#{@target.project.path}\""
       
-      cmd << "-scheme #{@scheme.name}" unless @scheme.nil?
+      cmd << "-scheme \"#{@scheme.name}\"" unless @scheme.nil?
       cmd << "-target \"#{@target.name}\"" if @scheme.nil?
       cmd << "-configuration \"#{@config.name}\"" if @scheme.nil?
       

data/lib/xcode/keychain.rb

@@ -1,4 +1,50 @@
 module Xcode
+  
+  module Keychains
+    
+    #
+    # Yield when the keychain is in the search path and remove it when the block returns
+    #
+    def self.with_keychain_in_search_path(kc, &block)
+      keychains = self.search_path
+      begin 
+        self.search_path = [kc] + keychains
+        yield
+      ensure
+        self.search_path = keychains
+      end
+    end
+    
+    
+    #
+    # Get the list of search keychains
+    #
+    # @return [Array<Xcode::Keychain>] the array of keychains the system currently searches
+    #
+    def self.search_path
+      `security list-keychain`.split.map do |keychain| 
+        Xcode::Keychain.new keychain.strip.gsub(/\"/,'')
+      end
+    end
+    
+    #
+    # Set the keychains search path and order
+    #
+    # @param [Array<Xcode::Keychain>] the array of keychains for the system to search when signing
+    #
+    def self.search_path=(keychains)
+      search_list = keychains.map do |kc|
+        "\"#{kc.path}\""
+      end
+      
+      cmd = []
+      cmd << "security"
+      cmd << "list-keychain"
+      cmd << "-s #{search_list.join(' ')}"
+      Xcode::Shell.execute(cmd)
+    end
+  end
+  
   class Keychain
     attr_accessor :name, :path
     
@@ -143,5 +189,6 @@ module Xcode
       yield(kc) if block_given?
       kc
     end
+    
   end
 end

data/lib/xcode/version.rb

@@ -1,3 +1,3 @@
 module Xcode
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

data/spec/keychain_spec.rb

@@ -38,4 +38,30 @@ describe Xcode::Keychain do
     kc = Xcode::Keychain.login
     File.exists?(kc.path).should==true
   end
+end
+
+describe Xcode::Keychains do
+  it "should read the current keychain search path" do
+    Xcode::Keychains.search_path[0].path.should=~/login.keychain/
+  end
+  
+  it "should update the keychain search path" do
+    keychains = Xcode::Keychains.search_path
+    test_keychain = Xcode::Keychain.new("#{File.dirname(__FILE__)}/Provisioning/Test.keychain")
+    begin 
+      Xcode::Keychains.search_path = [test_keychain] + keychains
+      `security list-keychains`.include?(test_keychain.path).should be_true
+    ensure
+      Xcode::Keychains.search_path = keychains
+    end
+  end
+  
+  it "should add the keychain to the search path and then remove it" do
+    test_keychain = Xcode::Keychain.new("#{File.dirname(__FILE__)}/Provisioning/Test.keychain")
+    Xcode::Keychains.with_keychain_in_search_path test_keychain do  
+      `security list-keychains`.include?(test_keychain.path).should be_true
+    end
+    
+    `security list-keychains`.include?(test_keychain.path).should be_false
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcoder
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-30 00:00:00.000000000Z
+date: 2012-04-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70315163014440 !ruby/object:Gem::Requirement
+  requirement: &70326152915240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70315163014440
+  version_requirements: *70326152915240
 - !ruby/object:Gem::Dependency
   name: plist
-  requirement: &70315157801340 !ruby/object:Gem::Requirement
+  requirement: &70326152914820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70315157801340
+  version_requirements: *70326152914820
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70315157800920 !ruby/object:Gem::Requirement
+  requirement: &70326152914400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70315157800920
+  version_requirements: *70326152914400
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70315157800500 !ruby/object:Gem::Requirement
+  requirement: &70326152913980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70315157800500
+  version_requirements: *70326152913980
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70315157800080 !ruby/object:Gem::Requirement
+  requirement: &70326152913560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70315157800080
+  version_requirements: *70326152913560
 description: Provides a ruby based object-model for parsing project structures and
   invoking builds
 email: